summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-11-02 21:52:19 +0000
committerKarl Berry <karl@freefriends.org>2014-11-02 21:52:19 +0000
commit4af247af38456365006cc56e3d8b438044b54294 (patch)
treeb3ded22ffe1e7abe4b299a1f713a7042b39df61c
parent7aabd76a5961aed06ec6edd2a33e46246b48209d (diff)
context-letter (2nov14)
git-svn-id: svn://tug.org/texlive/trunk@35487 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi375
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi219
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi69
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-03.mkvi211
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/resume-imp-default.mkiv134
5 files changed, 658 insertions, 350 deletions
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 3cf15016603..4301c031242 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
@@ -169,6 +169,7 @@
\installnamespace {correspondenceelement}
\installnamespace {correspondencelayout}
\installnamespace {correspondencehead}
+\installnamespace {correspondenceheadbuffer}
\installnamespace {correspondenceheadrenderings}
\installnamespace {correspondenceheadalternative}
\installnamespace {correspondenceparagraph}
@@ -195,7 +196,7 @@
{\iffirstargument
\setupcurrentcorrespondence[#parameters]%
\fi
- \grabbufferdatadirect{\????correspondencebuffer\currentcorrespondence}{\e!start\currentcorrespondence}{\e!stop\currentcorrespondence}\donothing}
+ \grabbufferdatadirect{\????correspondencebuffer\currentcorrespondence}{\e!start\currentcorrespondence}{\e!stop\currentcorrespondence}}
\unexpanded\def\correspondence_stop[#environment]%
{\correspondence_place[#environment]%
@@ -210,7 +211,7 @@
\unexpanded\def\correspondence_content_start[#environment]%
{\begingroup
\edef\currentcorrespondence{#environment}%
- \grabbufferdatadirect{\????correspondencebuffer\currentcorrespondence}{\e!start\currentcorrespondence\v!content}{\e!stop\currentcorrespondence\v!content}\donothing}
+ \grabbufferdatadirect{\????correspondencebuffer\currentcorrespondence}{\e!start\currentcorrespondence\v!content}{\e!stop\currentcorrespondence\v!content}}
\unexpanded\def\correspondence_content_stop[#environment]%
{\endgroup}
@@ -615,17 +616,17 @@
\setvalue{\????correspondencedescriptionformat\v!none}%
{\m_correspondence_description_items}
-%\def\correspondence_description_item#text%
-% {\begingroup
-% \setbox\scratchbox\hbox
-% {\usecorrespondencedescriptionstyleandcolor\c!symbolstyle\c!symbolcolor
-% \symbol{\correspondencedescriptionparameter\c!symbol}}%
-% \assignwidth
-% {\correspondencedescriptionparameter\c!symbolwidth}
-% {\scratchdimen}
-% {\unhcopy\scratchbox}
-% {\correspondencedescriptionparameter\c!symboldistance}%
-% \endgroup}
+% \def\correspondence_description_item#text%
+% {\begingroup
+% \setbox\scratchbox\hbox
+% {\usecorrespondencedescriptionstyleandcolor\c!symbolstyle\c!symbolcolor
+% \symbol{\correspondencedescriptionparameter\c!symbol}}%
+% \assignwidth
+% {\correspondencedescriptionparameter\c!symbolwidth}
+% {\scratchdimen}
+% {\unhcopy\scratchbox}
+% {\correspondencedescriptionparameter\c!symboldistance}%
+% \endgroup}
\setupcorrespondencedescription
[ \c!width=\v!fit,
@@ -637,16 +638,21 @@
\installsimplecommandhandler \????correspondenceparagraph {correspondenceparagraph} \????correspondenceparagraph
\installcommandhandler \????correspondenceparagraphalternative {correspondenceparagraphalternative} \????correspondenceparagraphalternative
-\newtoks\t_correspondence_paragraphs
-
-\appendtoks
- \the\t_correspondence_paragraphs
-\to \t_correspondence_before
+% \newtoks\t_correspondence_paragraphs
+%
+% \appendtoks
+% \the\t_correspondence_paragraphs
+% \to \t_correspondence_before
+%
+% \unexpanded\def\correspondence_paragraph_define[#environment][#element]%
+% {\def\currentcorrespondenceparagraph{#environment:#element}%
+% \checkcorrespondenceparagraphparent
+% \t_correspondence_paragraphs\expandafter{\the\t_correspondence_paragraphs\correspondence_paragraph_commands[#environment][#element]}}
\unexpanded\def\correspondence_paragraph_define[#environment][#element]%
{\def\currentcorrespondenceparagraph{#environment:#element}%
\checkcorrespondenceparagraphparent
- \t_correspondence_paragraphs\expandafter{\the\t_correspondence_paragraphs\correspondence_paragraph_commands[#environment][#element]}}
+ \correspondence_paragraph_commands[#environment][#element]}
\unexpanded\def\correspondence_paragraph_setup[#environment][#elements][#parameters]%
{\def\correspondence_paragraph_command#element%
@@ -667,16 +673,10 @@
{\iffirstargument
\setupcurrentcorrespondenceparagraph[#parameters]%
\fi
- \grabbufferdatadirect{\????correspondenceparagraphbuffer\currentcorrespondenceparagraph}{\e!start\currentcorrespondenceelement}{\e!stop\currentcorrespondenceelement}\donothing}
+ \grabbufferdatadirect{\????correspondenceparagraphbuffer\currentcorrespondenceparagraph}{\e!start\currentcorrespondenceelement}{\e!stop\currentcorrespondenceelement}}
\unexpanded\def\correspondence_paragraph_stop[#environment][#element]%
- {\edef\p_correspondence_paragraph_setups{\correspondenceparagraphparameter\c!setups}%
- \ifx\p_correspondence_paragraph_setups\empty \else
- \doifsetupselse{\????correspondenceparagraphsetups:#environment:\p_correspondence_paragraph_setups}
- {\texsetup{\????correspondenceparagraphsetups:#environment:\p_correspondence_paragraph_setups}}
- {\texsetup\p_correspondence_paragraph_setups}%
- \fi
- \doifsomethingelse{\correspondenceparagraphparameter\c!spacebefore}{\blank[\correspondenceparagraphparameter\c!spacebefore]}\endgraf
+ {\doifsomethingelse{\correspondenceparagraphparameter\c!spacebefore}{\blank[\correspondenceparagraphparameter\c!spacebefore]}\endgraf
\correspondence_paragraph_alternative_place
\doifsomethingelse{\correspondenceparagraphparameter\c!spaceafter }{\blank[\correspondenceparagraphparameter\c!spaceafter ]}\endgraf
\endgroup}
@@ -703,111 +703,85 @@
\edef\p_correspondence_paragraph_renderingsetup{\correspondenceparagraphalternativeparameter\c!renderingsetup}%
\autosetups\p_correspondence_paragraph_renderingsetup}
-\definecorrespondenceparagraphalternative[\s!default][\c!renderingsetup=\????correspondenceparagraphrenderings:\s!default]
-\definecorrespondenceparagraphalternative[\v!top ][\c!renderingsetup=\????correspondenceparagraphrenderings:\v!top ]
-\definecorrespondenceparagraphalternative[\v!margin ][\c!renderingsetup=\????correspondenceparagraphrenderings:\v!margin ]
-\definecorrespondenceparagraphalternative[\v!columns][\c!renderingsetup=\????correspondenceparagraphrenderings:\v!columns]
+\definecorrespondenceparagraphalternative[\s!default ][\c!renderingsetup=\????correspondenceparagraphrenderings:\s!default ]
+\definecorrespondenceparagraphalternative[\v!columns ][\c!renderingsetup=\????correspondenceparagraphrenderings:\v!columns ]
+\definecorrespondenceparagraphalternative[\c!lefttext ][\c!renderingsetup=\????correspondenceparagraphrenderings:\c!lefttext ]
+\definecorrespondenceparagraphalternative[\c!middletext][\c!renderingsetup=\????correspondenceparagraphrenderings:\c!middletext]
+\definecorrespondenceparagraphalternative[\c!righttext ][\c!renderingsetup=\????correspondenceparagraphrenderings:\c!righttext ]
\startsetups[\????correspondenceparagraphrenderings:\s!default]
- \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]
+ \ifdefined\currentparentcorrespondenceparagraph
+ \getbufferdata[\????correspondenceparagraphbuffer\currentparentcorrespondenceparagraph]
+ \else
+ \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph ]
+ \fi
\stopsetups
-\unexpanded\def\correspondence_paragraph_text
- {\edef\p_correspondence_paragraph_text{\correspondenceparagraphparameter\c!text}%
- \ifx\p_correspondence_paragraph_text\empty \else
- \begingroup
- \usecorrespondenceparagraphstyleandcolor\c!textstyle\c!textcolor
- \correspondenceparagraphparameter\c!text
- \endgraf
- \endgroup
- \doifsomethingelse{\correspondenceparagraphparameter\c!spaceinbetween}{\blank[\correspondenceparagraphparameter\c!spaceinbetween]}{\dosomebreak\nobreak}%
- \fi}
+\newbox \b_correspondence_paragraph
+\newcount\c_correspondence_paragraph
-\startsetups[\????correspondenceparagraphrenderings:\v!top]
- \correspondence_paragraph_text
- \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]
-\stopsetups
+\unexpanded\def\correspondence_paragraph_columns_start
+ {\begingroup
+ \global\c_correspondence_paragraph\zerocount
+ \edef\p_correspondence_paragraph_n {\correspondenceparagraphparameter\c!n }%
+ \edef\p_correspondence_paragraph_distance{\correspondenceparagraphparameter\c!distance}%
+ \letcorrespondenceparagraphparameter\c!alternative\v!default
+ \dontleavehmode\hbox\bgroup}
-\unexpanded\def\correspondence_paragraph_leftmargin
- {\edef\p_correspondence_paragraph_lefttext{\correspondenceparagraphparameter\c!lefttext}%
- \ifx\p_correspondence_paragraph_lefttext\empty \else
- \margindata
- [\v!inleft]
- [\c!style=\correspondenceparagraphparameter\c!leftstyle,
- \c!color=\correspondenceparagraphparameter\c!leftcolor]
- [\c!align=\correspondenceparagraphparameter\c!leftalign]
- {\p_correspondence_paragraph_lefttext}%
- \fi}
+\unexpanded\def\correspondence_paragraph_columns_stop
+ {\egroup
+ \endgroup}
-\unexpanded\def\correspondence_paragraph_rightmargin
- {\edef\p_correspondence_paragraph_righttext{\correspondenceparagraphparameter\c!righttext}%
- \ifx\p_correspondence_paragraph_righttext\empty \else
- \margindata
- [\v!inright]
- [\c!style=\correspondenceparagraphparameter\c!rightstyle,
- \c!color=\correspondenceparagraphparameter\c!rightcolor]
- [\c!align=\correspondenceparagraphparameter\c!rightalign]
- {\p_correspondence_paragraph_righttext}%
- \fi}
+\unexpanded\def\correspondence_paragraph_columns_place
+ {\begingroup
+ \global\advance\c_correspondence_paragraph\plusone
+ \let\currentparentcorrespondenceparagraph\currentcorrespondenceparagraph
+ \chaintocurrentcorrespondenceparagraph{\currentparentcorrespondenceparagraph:\number\c_correspondence_paragraph}%
+ \edef\currentcorrespondenceparagraph {\currentparentcorrespondenceparagraph:\number\c_correspondence_paragraph}%
+ \edef\p_correspondence_columns_width {\correspondenceparagraphparameter\c!width}%
+ \setbox\b_correspondence_paragraph\vtop\bgroup
+ \ifx\p_correspondence_columns_width\empty \else \hsize\p_correspondence_columns_width \fi
+ \usealignparameter\correspondenceparagraphparameter
+ \begstrut
+ \usecorrespondenceparagraphstyleandcolor\c!style\c!color
+ \correspondence_paragraph_alternative_place
+ \endstrut
+ \egroup
+ \ifzeropt\p_correspondence_columns_width \else
+ \ifnum\c_correspondence_paragraph>\p_correspondence_paragraph_n
+ % more columns are used than specified
+ \else\ifnum\c_correspondence_paragraph=\p_correspondence_paragraph_n
+ \box\b_correspondence_paragraph
+ \else
+ \box\b_correspondence_paragraph
+ \hskip\p_correspondence_paragraph_distance
+ \fi\fi
+ \fi
+ \endgroup}
-\startsetups[\????correspondenceparagraphrenderings:\v!margin]
- \correspondence_paragraph_leftmargin
- \correspondence_paragraph_rightmargin
- \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]
-\stopsetups
+\startsetups[\????correspondenceparagraphrenderings:\v!columns]
-\unexpanded\def\correspondence_paragraph_leftcolumn
- {\edef\p_correspondence_paragraph_leftwidth {\correspondenceparagraphparameter\c!leftwidth }%
- \edef\p_correspondence_paragraph_leftmargin{\correspondenceparagraphparameter\c!leftmargin}%
- \ifzeropt\p_correspondence_paragraph_leftwidth \else
- \setbox\scratchbox\vtop\bgroup
- \dontinterfere
- \hsize\p_correspondence_paragraph_leftwidth
- \usecorrespondenceparagraphstyleandcolor\c!leftstyle\c!leftcolor
- \begstrut\correspondenceparagraphparameter\c!lefttext\endstrut
- \egroup
- \llap{\box\scratchbox\hskip\p_correspondence_paragraph_leftmargin}%
- \doadaptleftskip{\dimexpr\p_correspondence_paragraph_leftwidth+\p_correspondence_paragraph_leftmargin\relax}%
- \fi}
+ \correspondence_paragraph_columns_start
+ \dorecurse\p_correspondence_paragraph_n\correspondence_paragraph_columns_place
+ \correspondence_paragraph_columns_stop
-\unexpanded\def\correspondence_paragraph_rightcolumn
- {\edef\p_correspondence_paragraph_rightwidth {\correspondenceparagraphparameter\c!rightwidth }%
- \edef\p_correspondence_paragraph_rightmargin{\correspondenceparagraphparameter\c!rightmargin}%
- \ifzeropt\p_correspondence_paragraph_rightwidth \else
- \setbox\scratchbox\vtop\bgroup
- \dontinterfere
- \hsize\p_correspondence_paragraph_rightwidth
- \usecorrespondenceparagraphstyleandcolor\c!rightstyle\c!rightcolor
- \begstrut\correspondenceparagraphparameter\c!righttext\endstrut
- \egroup
- \rlap{\hskip\dimexpr\hsize-\leftskip-\rightskip-\p_correspondence_paragraph_rightwidth+\p_correspondence_paragraph_rightmargin\relax\box\scratchbox}%
- \doadaptrightskip{\dimexpr\p_correspondence_paragraph_rightwidth+\p_correspondence_paragraph_rightmargin\relax}%
- \fi}
+\stopsetups
-% \startsetups[\????correspondenceparagraphrenderings:\v!columns]
-% \dontleavehmode
-% \correspondence_paragraph_leftcolumn
-% \correspondence_paragraph_rightcolumn
-% \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]
-% \stopsetups
+\startsetups[\????correspondenceparagraphrenderings:\c!lefttext]
-\startsetups[\????correspondenceparagraphrenderings:\v!columns]
+ \correspondenceparagraphparameter\c!lefttext
- \correspondence_paragraph_columns_start
+\stopsetups
+
+\startsetups[\????correspondenceparagraphrenderings:\c!middletext]
- \correspondence_paragraph_cell_start
- \correspondenceparagraphparameter\c!lefttext
- \correspondence_paragraph_cell_stop
+ \correspondenceparagraphparameter\c!middletext
- \correspondence_paragraph_cell_start
- \getbufferdata[\????correspondenceparagraphbuffer\currentparentcorrespondenceparagraph]
- \correspondence_paragraph_cell_stop
+\stopsetups
- \correspondence_paragraph_cell_start
- \correspondenceparagraphparameter\c!righttext
- \correspondence_paragraph_cell_stop
+\startsetups[\????correspondenceparagraphrenderings:\c!righttext]
- \correspondence_paragraph_columns_stop
+ \correspondenceparagraphparameter\c!righttext
\stopsetups
@@ -815,57 +789,10 @@
[\c!spacebefore=\v!line,
\c!spaceafter=\v!line,
\c!alternative=\s!default,
- \c!leftalign=\v!flushleft,
- \c!rightalign=\v!flushleft,
- \c!leftwidth=\zeropoint,
- \c!rightwidth=\zeropoint,
- \c!leftmargin=\zeropoint,
- \c!rightmargin=\zeropoint,
+ \c!distance=\zeropoint,
+ \c!width=\zeropoint,
\c!n=3]
-% Columns, only for internal use, take values from paragraphs
-
-\installbasicparameterhandler \????correspondencecolumns {correspondencecolumns}
-\installstyleandcolorhandler \????correspondencecolumns {correspondencecolumns}
-
-\newbox \b_correspondence_paragraph
-\newcount\c_correspondence_paragraph
-
-\unexpanded\def\correspondence_paragraph_columns_start
- {\begingroup
- \c_correspondence_paragraph\zerocount
- \let\currentparentcorrespondenceparagraph\currentcorrespondenceparagraph
- \edef\p_correspondence_paragraph_n {\correspondenceparagraphparameter\c!n }%
- \edef\p_correspondence_paragraph_distance{\correspondenceparagraphparameter\c!distance}%
- \dontleavehmode\hbox\bgroup}
-
-\unexpanded\def\correspondence_paragraph_columns_stop
- {\egroup
- \endgroup}
-
-\unexpanded\def\correspondence_paragraph_cell_start
- {\advance\c_correspondence_paragraph\plusone
- \chaintocurrentcorrespondenceparagraph{\currentparentcorrespondenceparagraph:\number\c_correspondence_paragraph}%
- \edef\currentcorrespondenceparagraph {\currentparentcorrespondenceparagraph:\number\c_correspondence_paragraph}%
- \edef\p_correspondence_columns_width {\correspondenceparagraphparameter\c!width}%
- \setbox\b_correspondence_paragraph\vtop\bgroup
- \ifx\p_correspondence_columns_width\empty \else \hsize\p_correspondence_columns_width \fi
- \begstrut}
-
-\unexpanded\def\correspondence_paragraph_cell_stop
- {\endstrut
- \egroup
- \ifnum\c_correspondence_paragraph>\p_correspondence_paragraph_n
- % more columns are used than specified
- \else\ifnum\c_correspondence_paragraph=\p_correspondence_paragraph_n
- \box\b_correspondence_paragraph
- \else
- \box\b_correspondence_paragraph
- \hskip\p_correspondence_paragraph_distance
- \fi\fi}
-
-
-
% Heading
\installframedcommandhandler \????correspondencehead {correspondencehead} \????correspondencehead
@@ -876,16 +803,21 @@
\definemarking[\currentcorrespondencehead]% \definemarking[\????correspondenceheadmarking\currentcorrespondencehead]
\to \everydefinecorrespondencehead
-\newtoks\t_correspondence_headings
-
-\appendtoks
- \the\t_correspondence_headings
-\to \t_correspondence_before
+% \newtoks\t_correspondence_headings
+%
+% \appendtoks
+% \the\t_correspondence_headings
+% \to \t_correspondence_before
+%
+% \unexpanded\def\correspondence_head_define[#environment][#element]%
+% {\def\currentcorrespondencehead{#environment:#element}%
+% \checkcorrespondenceheadparent
+% \t_correspondence_headings\expandafter{\the\t_correspondence_headings\correspondence_head_commands[#environment][#element]}}
\unexpanded\def\correspondence_head_define[#environment][#element]%
{\def\currentcorrespondencehead{#environment:#element}%
\checkcorrespondenceheadparent
- \t_correspondence_headings\expandafter{\the\t_correspondence_headings\correspondence_head_commands[#environment][#element]}}
+ \correspondence_head_commands[#environment][#element]}
\unexpanded\def\correspondence_head_setup[#environment][#elements][#parameters]%
{\def\correspondence_head_command#element%
@@ -894,41 +826,43 @@
\processcommacommand[#elements]\correspondence_head_command}
\unexpanded\def\correspondence_head_commands[#environment][#element]%
- {\setuevalue {#element}{\correspondence_head_direct[#environment][#element]}%
+ {%setuevalue {#element}{\correspondence_head_direct[#environment][#element]}%
\setuevalue{\e!start#element}{\correspondence_head_start [#environment][#element]}%
\setuevalue{\e!stop #element}{\correspondence_head_stop [#environment][#element]}}
-\unexpanded\def\correspondence_head_direct[#environment][#element]%
- {\begingroup
- \correspondence_parameters{#environment}{#element}%
- \doifnextbgroupelse{\dosinglegroupempty\correspondence_head_direct_argument}{\dosingleempty\correspondence_head_direct_parameters}}
-
-\unexpanded\def\correspondence_head_direct_argument#title%
- {\setcorrespondenceheadparameter\c!title{#title}%
- \correspondence_head_alternative_place
- \endgroup}
-
-\unexpanded\def\correspondence_head_direct_parameters[#parameters]%
- {\iffirstargument
- \setupcurrentcorrespondencehead[#parameters]%
- \fi
- \correspondence_head_alternative_place
- \endgroup}
+% \unexpanded\def\correspondence_head_direct[#environment][#element]%
+% {\begingroup
+% \correspondence_parameters{#environment}{#element}%
+% \doifnextbgroupelse{\dosinglegroupempty\correspondence_head_direct_argument}{\dosingleempty\correspondence_head_direct_parameters}}
+%
+% \unexpanded\def\correspondence_head_direct_argument#title%
+% {\setcorrespondenceheadparameter\c!title{#title}%
+% \correspondence_head_alternative_place
+% \endgroup}
+%
+% \unexpanded\def\correspondence_head_direct_parameters[#parameters]%
+% {\iffirstargument
+% \setupcurrentcorrespondencehead[#parameters]%
+% \fi
+% \correspondence_head_alternative_place
+% \endgroup}
\unexpanded\def\correspondence_head_start[#environment][#element]%
{\begingroup
\correspondence_parameters{#environment}{#element}%
- \dosingleempty\correspondence_head_start_parameters}
+ \dodoubleempty\correspondence_head_start_parameters}
-\unexpanded\def\correspondence_head_start_parameters[#parameters]%
+\unexpanded\def\correspondence_head_start_parameters[#parameters][#dummy]%
{\iffirstargument
\setupcurrentcorrespondencehead[#parameters]%
\fi
- \correspondence_head_alternative_place
- \endgroup}
+ \correspondenceheadparameter\c!beforesection
+ \grabbufferdatadirect{\????correspondenceheadbuffer\currentcorrespondencehead}{\e!start\currentcorrespondenceelement}{\e!stop\currentcorrespondenceelement}}
\unexpanded\def\correspondence_head_stop[#environment][#element]%
- {}
+ {\correspondence_head_alternative_place
+ \correspondenceheadparameter\c!aftersection
+ \endgroup}
\unexpanded\def\correspondence_head_alternative_define[#environment][#self][#parent][#parameters]%
{\iffourthargument
@@ -952,37 +886,56 @@
\edef\p_correspondence_section_renderingsetup{\correspondenceheadalternativeparameter\c!renderingsetup}%
\autosetups\p_correspondence_section_renderingsetup}
+\unexpanded\def\correspondenceheadtitle
+ {\begingroup
+ \usecorrespondenceheadstyleandcolor\c!style\c!color
+ \correspondenceheadparameter\c!textcommand{\begstrut\correspondenceheadparameter\c!title\endstrut}%
+ \endgroup}
+
+\unexpanded\def\correspondenceheadcontent
+ {\getbufferdata[\????correspondenceheadbuffer\currentcorrespondencehead]}
+
\definecorrespondenceheadalternative[\s!default ][\c!renderingsetup=\????correspondenceheadrenderings:\s!default ]
\definecorrespondenceheadalternative[\v!margin ][\c!renderingsetup=\????correspondenceheadrenderings:\v!margin ]
\definecorrespondenceheadalternative[\v!inmargin][\c!renderingsetup=\????correspondenceheadrenderings:\v!inmargin]
\startsetups[\????correspondenceheadrenderings:\s!default]
- \doifsomething{\correspondenceheadparameter\c!spacebefore}{\blank[\correspondenceheadparameter\c!spacebefore]}
+
+ \edef\p_spacebefore{\correspondenceheadparameter\c!spacebefore}
+ \edef\p_spaceafter {\correspondenceheadparameter\c!spaceafter }
+
+ \ifx\p_spacebefore\empty \else
+ \blank[\p_spacebefore]
+ \fi
+
\vbox\bgroup
- \doifsomething{\correspondenceheadparameter\c!align}{\setupalign[\correspondenceheadparameter\c!align]}
- \usecorrespondenceheadstyleandcolor\c!style\c!color
- \correspondenceheadparameter\c!title
+ \usealignparameter\correspondenceheadparameter
+ \correspondenceheadtitle
\egroup
- \doifsomething{\correspondenceheadparameter\c!spaceafter }{\blank[\correspondenceheadparameter\c!spaceafter ]}
+
+ \ifx\p_spaceafter\empty \else
+ \blank[\p_spaceafter]
+ \fi
+
+ \correspondenceheadcontent
+
\stopsetups
\startsetups[\????correspondenceheadrenderings:\v!margin]
- \doifsomething{\correspondenceheadparameter\c!spacebefore}{\blank[\correspondenceheadparameter\c!spacebefore]}
- \noindent\hskip-\dimexpr\leftmarginwidth+\leftmargindistance\relax
- \hbox\bgroup
- \usecorrespondenceheadstyleandcolor\c!style\c!color
- \correspondenceheadparameter\c!title
+
+ \dontleavehmode\llap\bgroup
+ \vtop\bgroup
+ \hsize\leftmarginwidth
+ \usealignparameter\correspondenceheadparameter
+ \correspondenceheadtitle
+ \egroup
+ \hskip\leftmargindistance
\egroup
- \doifsomething{\correspondenceheadparameter\c!spaceafter }{\blank[\correspondenceheadparameter\c!spaceafter ]}
-\stopsetups
-\startsetups[\????correspondenceheadrenderings:\v!inmargin]
- \margindata
- [inleft]
- [\c!style=\correspondenceheadparameter\c!style,
- \c!color=\correspondenceheadparameter\c!color]
- [\c!align=\correspondenceheadparameter\c!align]
- {\correspondenceheadparameter\c!title}
+ \blank[\v!overlay]
+
+ \correspondenceheadcontent
+
\stopsetups
\setupcorrespondencehead
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 268c57e5874..524bd06a32d 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
@@ -33,6 +33,11 @@
\setupmodule
[\c!style=dinb]
+% Namespaces
+
+\installnamespace {letterlayerrenderings}
+\installnamespace {lettersectionrenderings}
+
% Commands
\definecorrespondence[\v!letter]
@@ -128,11 +133,11 @@
% layer: head
-\defineletterlayeralternative[\v!head:\s!default][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\s!default]
+\defineletterlayeralternative[\v!head:\s!default][\c!renderingsetup=\????letterlayerrenderings:\v!head:\s!default]
\defineletterlayeralternative
[\v!head:\v!generic]
- [\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\v!generic,
+ [\c!renderingsetup=\????letterlayerrenderings:\v!head:\v!generic,
\c!rule=\correspondencelayerparameter\c!rule,
\c!rulewidth=\correspondencelayerparameter\c!rulewidth,
\c!rulecolor=\correspondencelayerparameter\c!rulecolor,
@@ -142,16 +147,16 @@
\defineletterlayeralternative[\v!head:\v!middle ][\v!head:\v!generic][\c!align=\v!middle ]
\defineletterlayeralternative[\v!head:\v!right ][\v!head:\v!generic][\c!align=\v!flushright]
-\defineletterlayeralternative[\v!head:\v!gbrief ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\v!gbrief ]
+\defineletterlayeralternative[\v!head:\v!gbrief ][\c!renderingsetup=\????letterlayerrenderings:\v!head:\v!gbrief ]
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!head:\s!default]
+\startsetups[\????letterlayerrenderings:\v!head:\s!default]
\def\\{\correspondencelayerparameter\c!separator}
\correspondenceparameter\c!fromname
\doifsomething{\correspondenceparameter\c!fromname}\\
\correspondenceparameter\c!fromaddress
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!head:\v!generic]
+\startsetups[\????letterlayerrenderings:\v!head:\v!generic]
\edef\p_rulewidth {\correspondencelayeralternativeparameter\c!rulewidth }
\edef\p_rulethickness{\correspondencelayeralternativeparameter\c!rulethickness}
\edef\p_rulecolor {\correspondencelayeralternativeparameter\c!rulecolor }
@@ -198,23 +203,23 @@
[\c!commandbefore=\correspondencelayerparameter\c!commandbefore,
\c!commandafter=\correspondencelayerparameter\c!commandafter]
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!head:\v!gbrief]
- \def\\{\correspondencelayerparameter\c!separator}%
+\startsetups[\????letterlayerrenderings:\v!head:\v!gbrief]
+ \def\\{\correspondencelayerparameter\c!separator}
\correspondenceparameter\c!fromname
\hrule
\stopsetups
% layer: nexthead
-\defineletterlayeralternative[\v!nexthead:\v!gbrief ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!gbrief ]
-\defineletterlayeralternative[\v!nexthead:\v!fullblock ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!fullblock]
-\defineletterlayeralternative[\v!nexthead:\v!hanging ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!hanging ]
-\defineletterlayeralternative[\v!nexthead:\v!semiblock ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!semiblock]
-\defineletterlayeralternative[\v!nexthead:\v!simplified][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!fullblock]
-\defineletterlayeralternative[\v!nexthead:\v!modified ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!hanging ]
-\defineletterlayeralternative[\v!nexthead:\v!knuth ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!knuth ]
+\defineletterlayeralternative[\v!nexthead:\v!gbrief ][\c!renderingsetup=\????letterlayerrenderings:\v!nexthead:\v!gbrief ]
+\defineletterlayeralternative[\v!nexthead:\v!fullblock ][\c!renderingsetup=\????letterlayerrenderings:\v!nexthead:\v!fullblock]
+\defineletterlayeralternative[\v!nexthead:\v!hanging ][\c!renderingsetup=\????letterlayerrenderings:\v!nexthead:\v!hanging ]
+\defineletterlayeralternative[\v!nexthead:\v!semiblock ][\c!renderingsetup=\????letterlayerrenderings:\v!nexthead:\v!semiblock]
+\defineletterlayeralternative[\v!nexthead:\v!simplified][\c!renderingsetup=\????letterlayerrenderings:\v!nexthead:\v!fullblock]
+\defineletterlayeralternative[\v!nexthead:\v!modified ][\c!renderingsetup=\????letterlayerrenderings:\v!nexthead:\v!hanging ]
+\defineletterlayeralternative[\v!nexthead:\v!knuth ][\c!renderingsetup=\????letterlayerrenderings:\v!nexthead:\v!knuth ]
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!gbrief]
+\startsetups[\????letterlayerrenderings:\v!nexthead:\v!gbrief]
\maxaligned
{\rlap{\correspondenceparameter\c!fromname}
\midaligned{\leftlettertext\c!pagenumber\subpagenumber\rightlettertext\c!pagenumber\lastsubpagenumber}
@@ -222,16 +227,16 @@
\hairline
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!fullblock]
+\startsetups[\????letterlayerrenderings:\v!nexthead:\v!fullblock]
\maxaligned
- {\rlap{\correspondenceparameter\c!toname}%
- \midaligned{\subpagenumber}%
+ {\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}}}
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!hanging]
+\startsetups[\????letterlayerrenderings:\v!nexthead:\v!hanging]
\maxaligned
{\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=v!right]
{\correspondenceparameter\c!toname \\
@@ -240,17 +245,17 @@
\lettertext\c!page\subpagenumber}}
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!semiblock]
+\startsetups[\????letterlayerrenderings:\v!nexthead:\v!semiblock]
\maxaligned
- {\rlap{\correspondenceparameter\c!toname}%
- \midaligned{\subpagenumber}%
+ {\rlap{\correspondenceparameter\c!toname}
+ \midaligned{\subpagenumber}
\llap{\correspondenceparameter\c!date}}
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!nexthead:\v!knuth]
+\startsetups[\????letterlayerrenderings:\v!nexthead:\v!knuth]
\maxaligned
- {\rlap{\correspondenceparameter\c!toname}%
- \midaligned{\currentdate}%
+ {\rlap{\correspondenceparameter\c!toname}
+ \midaligned{\currentdate}
\llap{\lettertext\c!page\subpagenumber}}
\stopsetups
@@ -264,10 +269,10 @@
% layer: foot
-\defineletterlayeralternative[\v!foot:\v!gbrief ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!foot:\v!gbrief]
-\defineletterlayeralternative[\v!foot:\v!pagenumber][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!foot:\v!pagenumber]
+\defineletterlayeralternative[\v!foot:\v!gbrief ][\c!renderingsetup=\????letterlayerrenderings:\v!foot:\v!gbrief]
+\defineletterlayeralternative[\v!foot:\v!pagenumber][\c!renderingsetup=\????letterlayerrenderings:\v!foot:\v!pagenumber]
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!foot:\v!gbrief]
+\startsetups[\????letterlayerrenderings:\v!foot:\v!gbrief]
\bTABLE[\c!frame=\v!off,\c!width=.25\hsize,\c!offset=\zeropoint]
\bTR[\c!style=\bfxx,\c!topframe=\v!on]
\bTD \lettertext\c!address \eTD
@@ -284,7 +289,7 @@
\eTABLE
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!foot:\v!pagenumber]
+\startsetups[\????letterlayerrenderings:\v!foot:\v!pagenumber]
\centerbox{\hbox{\begstrut\leftlettertext\c!pagenumber\subpagenumber\rightlettertext\c!pagenumber\lastsubpagenumber\endstrut}}
\stopsetups
@@ -302,18 +307,18 @@
% layer: address
-\defineletterlayeralternative[\v!address:\s!default][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!address:\s!default]
-\defineletterlayeralternative[\v!address:\v!a ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!address:\v!a ]
+\defineletterlayeralternative[\v!address:\s!default][\c!renderingsetup=\????letterlayerrenderings:\v!address:\s!default]
+\defineletterlayeralternative[\v!address:\v!a ][\c!renderingsetup=\????letterlayerrenderings:\v!address:\v!a ]
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!address:\s!default]
- \def\\{\correspondencelayerparameter\c!separator}%
+\startsetups[\????letterlayerrenderings:\v!address:\s!default]
+ \def\\{\correspondencelayerparameter\c!separator}
\doifsomething{\correspondenceparameter\c!dispatch}{\correspondenceparameter\c!dispatch\\}
\doifsomething{\correspondenceparameter\c!toname }{\correspondenceparameter\c!toname \\}
\correspondenceparameter\c!toaddress
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!address:\v!a]
- \def\\{\correspondencelayerparameter\c!separator}%
+\startsetups[\????letterlayerrenderings:\v!address:\v!a]
+ \def\\{\correspondencelayerparameter\c!separator}
\doifsomethingelse{\correspondenceparameter\c!dispatch}
{\correspondenceparameter\c!dispatch\\} % check number of lines!
{\blank[2*\v!line]}
@@ -323,17 +328,17 @@
% layer: backaddress
-\defineletterlayeralternative[\v!backaddress:\s!default][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!backaddress:\s!default]
-\defineletterlayeralternative[\v!backaddress:\v!auto ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!backaddress:\v!auto ]
+\defineletterlayeralternative[\v!backaddress:\s!default][\c!renderingsetup=\????letterlayerrenderings:\v!backaddress:\s!default]
+\defineletterlayeralternative[\v!backaddress:\v!auto ][\c!renderingsetup=\????letterlayerrenderings:\v!backaddress:\v!auto ]
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!backaddress:\s!default]
+\startsetups[\????letterlayerrenderings:\v!backaddress:\s!default]
\def\\{\correspondencelayerparameter\c!separator}
\correspondenceparameter\c!fromname
\doifsomething{\correspondenceparameter\c!fromaddress}\\
\correspondenceparameter\c!fromaddress
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!backaddress:\v!auto]
+\startsetups[\????letterlayerrenderings:\v!backaddress:\v!auto]
\def\\{\correspondencelayerparameter\c!separator}
\doifsomethingelse{\correspondenceparameter\c!backaddress}
{\correspondenceparameter\c!backaddress}
@@ -344,50 +349,50 @@
% layer: reference
-\defineletterlayeralternative[\v!reference:\s!default][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\s!default]
-\defineletterlayeralternative[\v!reference:\v!a ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!a ]
-%defineletterlayeralternative[\v!reference:\v!top ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!a ]
-\defineletterlayeralternative[\v!reference:\v!b ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!b ]
-%defineletterlayeralternative[\v!reference:\v!block ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!b ]
-\defineletterlayeralternative[\v!reference:\v!c ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!c ]
-%defineletterlayeralternative[\v!reference:\v!line ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!c ]
-\defineletterlayeralternative[\v!reference:\v!d ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!d ]
-%defineletterlayeralternative[\v!reference:\v!table ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!d ]
-\defineletterlayeralternative[\v!reference:\v!e ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!e ]
-%defineletterlayeralternative[\v!reference:\v!width ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!reference:\v!e ]
+\defineletterlayeralternative[\v!reference:\s!default][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\s!default]
+\defineletterlayeralternative[\v!reference:\v!a ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!a ]
+%defineletterlayeralternative[\v!reference:\v!top ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!a ]
+\defineletterlayeralternative[\v!reference:\v!b ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!b ]
+%defineletterlayeralternative[\v!reference:\v!block ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!b ]
+\defineletterlayeralternative[\v!reference:\v!c ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!c ]
+%defineletterlayeralternative[\v!reference:\v!line ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!c ]
+\defineletterlayeralternative[\v!reference:\v!d ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!d ]
+%defineletterlayeralternative[\v!reference:\v!table ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!d ]
+\defineletterlayeralternative[\v!reference:\v!e ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!e ]
+%defineletterlayeralternative[\v!reference:\v!width ][\c!renderingsetup=\????letterlayerrenderings:\v!reference:\v!e ]
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!reference:\s!default]
+\startsetups[\????letterlayerrenderings:\v!reference:\s!default]
\correspondenceparameter\c!reference
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!reference:\v!a]
+\startsetups[\????letterlayerrenderings:\v!reference:\v!a]
\ctxlua{thirddata.correspondence.letter.reference_a("\v!letter","\correspondencelayerparameter\c!list")}
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!reference:\v!b]
+\startsetups[\????letterlayerrenderings:\v!reference:\v!b]
\ctxlua{thirddata.correspondence.letter.reference_b("\v!letter","\correspondencelayerparameter\c!list")}
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!reference:\v!c]
+\startsetups[\????letterlayerrenderings:\v!reference:\v!c]
\ctxlua{thirddata.correspondence.letter.reference_c("\v!letter","\correspondencelayerparameter\c!list")}
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!reference:\v!d]
+\startsetups[\????letterlayerrenderings:\v!reference:\v!d]
\ctxlua{thirddata.correspondence.letter.reference_d("\v!letter","\correspondencelayerparameter\c!list")}
\stopsetups
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!reference:\v!e]
+\startsetups[\????letterlayerrenderings:\v!reference:\v!e]
\ctxlua{thirddata.correspondence.letter.reference_e("\v!letter","\correspondencelayerparameter\c!list")}
\stopsetups
% layer: location
-\defineletterlayeralternative[\v!location:\v!french][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!location:\v!french]
+\defineletterlayeralternative[\v!location:\v!french][\c!renderingsetup=\????letterlayerrenderings:\v!location:\v!french]
-\startsetups[\????correspondencelayerrenderings:\v!letter:\v!location:\v!french]
+\startsetups[\????letterlayerrenderings:\v!location:\v!french]
\def\\{\correspondencelayerparameter\c!separator}
- \doifsomething{\correspondenceparameter\c!place}{\correspondenceparameter\c!place\\}%
+ \doifsomething{\correspondenceparameter\c!place}{\correspondenceparameter\c!place\\}
\correspondenceparameter\c!date
\stopsetups
@@ -421,46 +426,46 @@
% section: head
-\definelettersectionalternative[\v!head:\v!blockstyle][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!head:\v!blockstyle]
+\definelettersectionalternative[\v!head:\v!blockstyle][\c!renderingsetup=\????lettersectionrenderings:\v!head:\v!blockstyle]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!head:\v!blockstyle]
+\startsetups[\????lettersectionrenderings:\v!head:\v!blockstyle]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!fromaddress
\stopsetups
% section: date
-\definelettersectionalternative[\v!date:\v!blockstyle][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!date:\v!blockstyle]
+\definelettersectionalternative[\v!date:\v!blockstyle][\c!renderingsetup=\????lettersectionrenderings:\v!date:\v!blockstyle]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!date:\v!blockstyle]
+\startsetups[\????lettersectionrenderings:\v!date:\v!blockstyle]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!date
\stopsetups
% section: reference
-\definelettersectionalternative[\v!reference:\v!blockstyle][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!reference:\v!blockstyle]
+\definelettersectionalternative[\v!reference:\v!blockstyle][\c!renderingsetup=\????lettersectionrenderings:\v!reference:\v!blockstyle]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!reference:\v!blockstyle]
+\startsetups[\????lettersectionrenderings:\v!reference:\v!blockstyle]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!reference
\stopsetups
% section: specialnotation
-\definelettersectionalternative[\v!specialnotation:\v!blockstyle][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!specialnotation:\v!blockstyle]
+\definelettersectionalternative[\v!specialnotation:\v!blockstyle][\c!renderingsetup=\????lettersectionrenderings:\v!specialnotation:\v!blockstyle]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!specialnotation:\v!blockstyle]
+\startsetups[\????lettersectionrenderings:\v!specialnotation:\v!blockstyle]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!dispatch
\stopsetups
% section: address
-\definelettersectionalternative[\v!address:\v!blockstyle][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!address:\v!blockstyle]
-\definelettersectionalternative[\v!address:\v!knuth ][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!address:\v!blockstyle]
+\definelettersectionalternative[\v!address:\v!blockstyle][\c!renderingsetup=\????lettersectionrenderings:\v!address:\v!blockstyle]
+\definelettersectionalternative[\v!address:\v!knuth ][\c!renderingsetup=\????lettersectionrenderings:\v!address:\v!blockstyle]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!address:\v!blockstyle]
+\startsetups[\????lettersectionrenderings:\v!address:\v!blockstyle]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!toname
\doifsomething{\correspondenceparameter\c!toname}\\
@@ -469,10 +474,10 @@
% section: title
-\definelettersectionalternative[\v!title:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!title:\s!default]
+\definelettersectionalternative[\v!title:\s!default][\c!renderingsetup=\????lettersectionrenderings:\v!title:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!title:\s!default]
- \def\\{\correspondencesectionparameter\c!separator}%
+\startsetups[\????lettersectionrenderings:\v!title:\s!default]
+ \def\\{\correspondencesectionparameter\c!separator}
\doifsomethingelse{\correspondenceparameter\c!title}
{\correspondenceparameter\c!title}
{\lettertext\c!attention\correspondenceparameter\c!attention}
@@ -480,27 +485,27 @@
% section: subject
-\definelettersectionalternative[\v!subject:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!subject:\s!default]
+\definelettersectionalternative[\v!subject:\s!default][\c!renderingsetup=\????lettersectionrenderings:\v!subject:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!subject:\s!default]
- \def\\{\correspondencesectionparameter\c!separator}%
+\startsetups[\????lettersectionrenderings:\v!subject:\s!default]
+ \def\\{\correspondencesectionparameter\c!separator}
\lettertext\c!subject\correspondenceparameter\c!subject
\stopsetups
% section: opening
-\definelettersectionalternative[\v!opening:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!opening:\s!default]
-\definelettersectionalternative[\v!opening:\v!french ][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!opening:\v!french ]
+\definelettersectionalternative[\v!opening:\s!default][\c!renderingsetup=\????lettersectionrenderings:\v!opening:\s!default]
+\definelettersectionalternative[\v!opening:\v!french ][\c!renderingsetup=\????lettersectionrenderings:\v!opening:\v!french ]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!opening:\s!default]
- \def\\{\correspondencesectionparameter\c!separator}%
+\startsetups[\????lettersectionrenderings:\v!opening:\s!default]
+ \def\\{\correspondencesectionparameter\c!separator}
\doifsomethingelse{\correspondenceparameter\c!opening}
{\correspondenceparameter\c!opening}
{\correspondenceparameter\c!salutation}
\stopsetups
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!opening:\v!french]
- \def\\{\correspondencesectionparameter\c!separator}%
+\startsetups[\????lettersectionrenderings:\v!opening:\v!french]
+ \def\\{\correspondencesectionparameter\c!separator}
\doifsomething{\correspondenceoptionparameter\c!indenting}{\setupindenting[\correspondenceoptionparameter\c!indenting]}
\doifsomethingelse{\correspondenceparameter\c!opening}
{\correspondenceparameter\c!opening}
@@ -509,60 +514,60 @@
% section: content
-\definelettersectionalternative[\v!content:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!content:\s!default]
+\definelettersectionalternative[\v!content:\s!default][\c!renderingsetup=\????lettersectionrenderings:\v!content:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!content:\s!default]
+\startsetups[\????lettersectionrenderings:\v!content:\s!default]
\getbufferdata[\????correspondencebuffer\v!letter]
\stopsetups
% section: closing
-\definelettersectionalternative[\v!closing:\s!default ][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!closing:\s!default ]
-\definelettersectionalternative[\v!closing:\v!french ][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!closing:\v!french ]
-\definelettersectionalternative[\v!closing:\v!simplified][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!closing:\v!simplified]
-\definelettersectionalternative[\v!closing:\v!knuth ][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!closing:\v!knuth ]
+\definelettersectionalternative[\v!closing:\s!default ][\c!renderingsetup=\????lettersectionrenderings:\v!closing:\s!default ]
+\definelettersectionalternative[\v!closing:\v!french ][\c!renderingsetup=\????lettersectionrenderings:\v!closing:\v!french ]
+\definelettersectionalternative[\v!closing:\v!simplified][\c!renderingsetup=\????lettersectionrenderings:\v!closing:\v!simplified]
+\definelettersectionalternative[\v!closing:\v!knuth ][\c!renderingsetup=\????lettersectionrenderings:\v!closing:\v!knuth ]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!closing:\s!default]
- \def\\{\correspondencesectionparameter\c!separator}%
+\startsetups[\????lettersectionrenderings:\v!closing:\s!default]
+ \def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!closing
\doifsomething{\correspondenceparameter\c!signature}
- {\blank[\correspondencesectionparameter\c!spaceinbetween]%
+ {\blank[\correspondencesectionparameter\c!spaceinbetween]
\correspondenceparameter\c!signature}
\stopsetups
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!closing:\v!french]
- \def\\{\correspondencesectionparameter\c!separator}%
- \doifsomething{\correspondenceoptionparameter\c!indenting}{\setupindenting[\correspondenceoptionparameter\c!indenting,\v!first]}%
+\startsetups[\????lettersectionrenderings:\v!closing:\v!french]
+ \def\\{\correspondencesectionparameter\c!separator}
+ \doifsomething{\correspondenceoptionparameter\c!indenting}{\setupindenting[\correspondenceoptionparameter\c!indenting,\v!first]}
\correspondenceparameter\c!closing
\doifsomething{\correspondenceparameter\c!signature}
- {\blank[\correspondencesectionparameter\c!spaceinbetween]%
- \raggedcenter\doadaptleftskip{.5\textwidth}%
+ {\blank[\correspondencesectionparameter\c!spaceinbetween]
+ \raggedcenter\doadaptleftskip{.5\textwidth}
\correspondenceparameter\c!signature\endgraf}
\stopsetups
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!closing:\v!simplified]
- \def\\{\correspondencesectionparameter\c!separator}%
- \doifsomething{\correspondenceparameter\c!signature}{\blank[\correspondencesectionparameter\c!spaceinbetween]}%
+\startsetups[\????lettersectionrenderings:\v!closing:\v!simplified]
+ \def\\{\correspondencesectionparameter\c!separator}
+ \doifsomething{\correspondenceparameter\c!signature}{\blank[\correspondencesectionparameter\c!spaceinbetween]}
\correspondenceparameter\c!signature
\stopsetups
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!closing:\v!knuth]
- \def\\{\correspondencesectionparameter\c!separator}%
- \doadaptleftskip{\dimexpr\textwidth/13*8\relax}%
+\startsetups[\????lettersectionrenderings:\v!closing:\v!knuth]
+ \def\\{\correspondencesectionparameter\c!separator}
+ \doadaptleftskip{\dimexpr\textwidth/13*8\relax}
\correspondenceparameter\c!closing
\doifsomething{\correspondenceparameter\c!signature}
- {\blank[\correspondencesectionparameter\c!spaceinbetween]%
+ {\blank[\correspondencesectionparameter\c!spaceinbetween]
\correspondenceparameter\c!signature}
\stopsetups
% section: appendices
-\definelettersectionalternative[\v!appendices:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!letter:\v!appendices:\s!default]
+\definelettersectionalternative[\v!appendices:\s!default][\c!renderingsetup=\????lettersectionrenderings:\v!appendices:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!letter:\v!appendices:\s!default]
- \def\\{\correspondencesectionparameter\c!separator}%
+\startsetups[\????lettersectionrenderings:\v!appendices:\s!default]
+ \def\\{\correspondencesectionparameter\c!separator}
\startpacked
- \processcommacommand[\correspondence_elements_access\v!letter\v!description]{\correspondence_description_place\v!letter}%
+ \processcommacommand[\correspondence_elements_access\v!letter\v!description]{\correspondence_description_place\v!letter}
\stoppacked
\stopsetups
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 dadfe033c57..e4c3efea32f 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
@@ -32,6 +32,11 @@
\setupmodule
[\c!style=memo]
+% Namespaces
+
+\installnamespace {memolayerrenderings}
+\installnamespace {memosectionrenderings}
+
% Commands
\definecorrespondence[\v!memo]
@@ -135,9 +140,9 @@
% layer: foot
-\definememolayeralternative[\v!foot:\v!pagenumber][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!foot:\v!pagenumber]
+\definememolayeralternative[\v!foot:\v!pagenumber][\c!renderingsetup=\????memosectionrenderings:\v!foot:\v!pagenumber]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!foot:\v!pagenumber]
+\startsetups[\????memosectionrenderings:\v!foot:\v!pagenumber]
\centerbox{\hbox{\begstrut\leftmemotext\c!pagenumber\subpagenumber\rightmemotext\c!pagenumber\lastsubpagenumber\endstrut}}
\stopsetups
@@ -171,17 +176,17 @@
% section: head
-\definememosectionalternative[\v!head:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!head:\s!default]
-\definememosectionalternative[\v!head:\v!memo ][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!head:\v!memo ]
-\definememosectionalternative[\v!head:\v!table ][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!head:\v!table ]
-\definememosectionalternative[\v!head:\v!margin ][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!head:\v!margin ]
+\definememosectionalternative[\v!head:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!head:\s!default]
+\definememosectionalternative[\v!head:\v!memo ][\c!renderingsetup=\????memosectionrenderings:\v!head:\v!memo ]
+\definememosectionalternative[\v!head:\v!table ][\c!renderingsetup=\????memosectionrenderings:\v!head:\v!table ]
+\definememosectionalternative[\v!head:\v!margin ][\c!renderingsetup=\????memosectionrenderings:\v!head:\v!margin ]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!head:\s!default]
+\startsetups[\????memosectionrenderings:\v!memo:\v!head:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!fromaddress
\stopsetups
-\startsetups[\v!head:\v!memo]
+\startsetups[\???memosectionrenderings\v!head:\v!memo]
\def\\{\correspondencesectionparameter\c!separator}
\startpacked
\doifsomething{\correspondenceparameter\c!fromname}{\memotext\c!fromname \correspondenceparameter\c!fromname \par}
@@ -203,7 +208,7 @@
\correspondenceparameter#element
\NC\NR}}
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!head:\v!table]
+\startsetups[\????memosectionrenderings:\v!head:\v!table]
\def\\{\correspondencesectionparameter\c!separator}
\starttabulate[|l|p|]
\correspondence_memo_head_table\c!fromname
@@ -227,7 +232,7 @@
\egroup
\par}}
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!head:\v!margin]
+\startsetups[\????memosectionrenderings:\v!head:\v!margin]
\def\\{\correspondencesectionparameter\c!separator}
\startpacked
\correspondence_memo_head_margin\c!fromname
@@ -239,36 +244,36 @@
% section: date
-\definememosectionalternative[\v!date:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!date:\s!default]
+\definememosectionalternative[\v!date:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!date:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!date:\s!default]
+\startsetups[\????memosectionrenderings:\v!date:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!date
\stopsetups
% section: reference
-\definememosectionalternative[\v!reference:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!reference:\s!default]
+\definememosectionalternative[\v!reference:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!reference:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!reference:\s!default]
+\startsetups[\????memosectionrenderings:\v!reference:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!reference
\stopsetups
% section: specialnotation
-\definememosectionalternative[\v!specialnotation:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!specialnotation:\s!default]
+\definememosectionalternative[\v!specialnotation:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!specialnotation:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!specialnotation:\s!default]
+\startsetups[\????memosectionrenderings:\v!specialnotation:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!dispatch
\stopsetups
% section: address
-\definememosectionalternative[\v!address:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!address:\s!default]
+\definememosectionalternative[\v!address:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!address:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!address:\s!default]
+\startsetups[\????memosectionrenderings:\v!address:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!toname
\doifsomething{\correspondenceparameter\c!toname}\\
@@ -277,44 +282,44 @@
% section: title
-\definememosectionalternative[\v!title:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!title:\s!default]
+\definememosectionalternative[\v!title:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!title:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!title:\s!default]
+\startsetups[\????memosectionrenderings:\v!title:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!title
\stopsetups
% section: opening
-\definememosectionalternative[\v!opening:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!opening:\s!default]
+\definememosectionalternative[\v!opening:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!opening:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!opening:\s!default]
+\startsetups[\????memosectionrenderings:\v!opening:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!opening
\stopsetups
% section: subject
-\definememosectionalternative[\v!subject:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!subject:\s!default]
+\definememosectionalternative[\v!subject:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!subject:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!subject:\s!default]
+\startsetups[\????memosectionrenderings:\v!subject:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\memotext\c!subject\correspondenceparameter\c!subject
\stopsetups
% section: content
-\definememosectionalternative[\v!content:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!content:\s!default]
+\definememosectionalternative[\v!content:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!content:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!content:\s!default]
+\startsetups[\????memosectionrenderings:\v!content:\s!default]
\getbufferdata[\????correspondencebuffer\v!memo]
\stopsetups
% section: closing
-\definememosectionalternative[\v!closing:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!closing:\s!default]
+\definememosectionalternative[\v!closing:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!closing:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!closing:\s!default]
+\startsetups[\????memosectionrenderings:\v!closing:\s!default]
\def\\{\correspondencesectionparameter\c!separator}
\correspondenceparameter\c!closing
\doifsomething{\correspondenceparameter\c!signature}
@@ -324,12 +329,12 @@
% section: appendices
-\definememosectionalternative[\v!appendices:\s!default][\c!renderingsetup=\????correspondencesectionrenderings:\v!memo:\v!appendices:\s!default]
+\definememosectionalternative[\v!appendices:\s!default][\c!renderingsetup=\????memosectionrenderings:\v!appendices:\s!default]
-\startsetups[\????correspondencesectionrenderings:\v!memo:\v!appendices:\s!default]
- \def\\{\correspondencesectionparameter\c!separator}%
+\startsetups[\????memosectionrenderings:\v!appendices:\s!default]
+ \def\\{\correspondencesectionparameter\c!separator}
\startpacked
- \normalexpanded{\processcommalistwithparameters[\correspondence_elements_access\v!memo\v!description]}{\correspondence_description_place[\v!memo]}%
+ \normalexpanded{\processcommalistwithparameters[\correspondence_elements_access\v!memo\v!description]}{\correspondence_description_place[\v!memo]}
\stoppacked
\stopsetups
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-03.mkvi b/Master/texmf-dist/tex/context/third/letter/base/s-cor-03.mkvi
new file mode 100644
index 00000000000..e0f8c3e80c9
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-03.mkvi
@@ -0,0 +1,211 @@
+%D \module
+%D [ file=s-cor-03,
+%D version=2012.12.13,
+%D title=\CONTEXT\ User Module,
+%D subtitle=Resume,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2011 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C (at your option) any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\unprotect
+
+\startmodule[resume]
+
+\usemodule[cor-00]
+
+\setupmodule
+ [\c!style=]
+
+% Namespaces
+
+\installnamespace {resumelayerrenderings}
+\installnamespace {resumesectionrenderings}
+
+% Commands
+
+\definecorrespondence[\v!resume]
+
+\def\defineresumelayer {\dodoubleargument\correspondence_layer_define [\v!resume]}
+\def\defineresumesection {\dodoubleargument\correspondence_section_define [\v!resume]}
+\def\defineresumedescription {\dodoubleargument\correspondence_description_define [\v!resume]}
+\def\defineresumehead {\dodoubleargument\correspondence_head_define [\v!resume]}
+\def\defineresumeparagraph {\dodoubleargument\correspondence_paragraph_define [\v!resume]}
+
+\def\defineresumelayeralternative {\doquadrupleempty\correspondence_layer_alternative_define [\v!resume]}
+\def\defineresumesectionalternative {\doquadrupleempty\correspondence_section_alternative_define [\v!resume]}
+\def\defineresumeheadalternative {\doquadrupleempty\correspondence_head_alternative_define [\v!resume]}
+\def\defineresumeparagraphalternative {\doquadrupleempty\correspondence_paragraph_alternative_define [\v!resume]}
+
+\def\defineresumeelements {\dotripleargument\correspondence_elements_define [\v!resume]}
+\def\setupresumeelements {\dotripleargument\correspondence_elements_define [\v!resume]}
+
+\def\setupresumestyle {\dotripleargument\correspondence_style_setup [\v!resume]}
+\def\setupresumelayer {\dotripleargument\correspondence_layer_setup [\v!resume]}
+\def\setupresumeframe {\dotripleargument\correspondence_frame_setup [\v!resume]}
+\def\setupresumelayout {\dotripleargument\correspondence_layout_setup [\v!resume]}
+\def\setupresumesection {\dotripleargument\correspondence_section_setup [\v!resume]}
+\def\setupresumedescription {\dotripleargument\correspondence_description_setup [\v!resume]}
+\def\setupresumehead {\dotripleargument\correspondence_head_setup [\v!resume]}
+\def\setupresumeparagraph {\dotripleargument\correspondence_paragraph_setup [\v!resume]}
+\def\setupresumeoptions {\dodoubleargument\correspondence_option_setup [\v!resume]}
+\def\setupresume {\dodoubleargument\correspondence_setup [\v!resume]}
+
+\def\setupresumelayeralternative {\dotripleargument\correspondence_layer_alternative_setup [\v!resume]}
+\def\setupresumesectionalternative {\dotripleargument\correspondence_section_alternative_setup [\v!resume]}
+\def\setupresumeheadalternative {\dotripleargument\correspondence_head_alternative_setup [\v!resume]}
+\def\setupresumeparagraphalternative {\dotripleargument\correspondence_paragraph_alternative_setup [\v!resume]}
+
+\def\useresumestyle {\dodoubleargument\correspondence_file_load [\v!resume]}
+
+\def\defineresumeelement {\doquadrupleargument\correspondence_element_define [\v!resume]}
+\def\resumeelement {\doquadrupleargument\correspondence_element_place [\v!resume]}
+
+\def\namedresumelayerparameter #element{\namedcorrespondencelayerparameter {\v!resume:#element}}
+\def\namedresumeframeparameter #element{\namedcorrespondenceframeparameter {\v!resume:#element}}
+\def\namedresumesectionparameter #element{\namedcorrespondencesectionparameter {\v!resume:#element}}
+\def\namedresumeparagraphparameter#element{\namedcorrespondenceparagraphparameter{\v!resume:#element}}
+
+% Heading
+
+\defineresumehead [\v!resume\v!section]
+\defineresumehead [\v!resume\v!subsection]
+
+% Paragraphs
+
+\defineresumeparagraph [\v!resume\v!paragraph]
+\defineresumeparagraph [\v!two\v!columns]
+\defineresumeparagraph [\v!three\v!columns]
+
+% Layers
+
+\defineresumelayer [\v!head]
+\defineresumelayer [\v!nexthead]
+\defineresumelayer [\v!lefthead]
+\defineresumelayer [\v!righthead]
+
+\defineresumelayer [\v!foot]
+\defineresumelayer [\v!nextfoot]
+\defineresumelayer [\v!leftfoot]
+\defineresumelayer [\v!rightfoot]
+
+\defineresumelayer [\v!topmark]
+\defineresumelayer [\v!botmark]
+\defineresumelayer [\v!cutmark]
+\defineresumelayer [\v!endmark]
+\defineresumelayer [\v!usermark]
+
+\defineresumelayer [\v!resumemain]
+\defineresumelayer [\v!resumenext]
+
+% Section
+
+\defineresumesection [\v!head]
+\defineresumesection [\v!content]
+\defineresumesection [\v!closing]
+
+% Setups
+
+% layer: head
+
+% setups -> see s-cor-00.mkvi
+
+% layer: nexthead
+
+% setups -> see s-cor-00.mkvi
+
+% layer: lefthead
+
+% setups -> see s-cor-00.mkvi
+
+% layer: righthead
+
+% setups -> see s-cor-00.mkvi
+
+% layer: topmark
+
+% setups -> see s-cor-00.mkvi
+
+% layer: botmark
+
+% setups -> see s-cor-00.mkvi
+
+% layer: cutmark
+
+% setups -> see s-cor-00.mkvi
+
+% layer: endmark
+
+% setups -> see s-cor-00.mkvi
+
+% layer: usermark
+
+% setups -> see s-cor-00.mkvi
+
+% layer: resumemain
+
+% setups -> see s-cor-00.mkvi
+
+% layer: resumenext
+
+% setups -> see s-cor-00.mkvi
+
+% section: head
+
+\defineresumesectionalternative[\v!head:\s!default][\c!renderingsetup=\????resumesectionrenderings:\v!head:\s!default]
+
+\startsetups[\????resumesectionrenderings:\v!head:\s!default]
+ \def\\{\correspondencesectionparameter\c!separator}
+ \correspondenceparameter\c!fromaddress
+\stopsetups
+
+% section: content
+
+\defineresumesectionalternative[\v!content:\s!default][\c!renderingsetup=\????resumesectionrenderings:\v!content:\s!default]
+
+\startsetups[\????resumesectionrenderings:\v!content:\s!default]
+ \getbufferdata[\????correspondencebuffer\v!resume]
+\stopsetups
+
+% section: closing
+
+% setups -> see s-cor-00.mkvi
+
+% paragraph:
+
+
+
+% Extras
+
+\appendtoks
+ \ifx\currentcorrespondence\v!resume
+ \doif{\correspondenceoptionparameter\c!marking}\v!no{\setupresumelayer[\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark][\c!state=\v!stop]}%
+ \fi
+\to \t_correspondence_before
+
+% Labels
+
+\definelabelclass[resume]
+
+% Files
+
+\useresumestyle[default,\currentmoduleparameter\c!style]
+
+\stopmodule
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/resume-imp-default.mkiv b/Master/texmf-dist/tex/context/third/letter/style/resume-imp-default.mkiv
new file mode 100644
index 00000000000..b08c5aba361
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/letter/style/resume-imp-default.mkiv
@@ -0,0 +1,134 @@
+%D \module
+%D [ file=resume-imp-default,
+%D version=2012.02.04,
+%D title=\CONTEXT\ Resume Style,
+%D subtitle=Default style,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2012 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C (at your option) any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\setupresumelayout
+ [\v!firstpage,\v!secondpage]
+ [\c!topspace=2.5cm,
+ \c!header=0mm, % 2.0cm,
+ \c!headerdistance=0pt,
+ \c!height=\v!middle,
+ \c!footerdistance=0pt,
+ \c!footer=0mm, % 2.0cm,
+ \c!backspace=2.5cm,
+ \c!width=\v!middle,
+ \c!cutspace=3.5cm,
+ \c!grid=\v!no]
+
+\setupresumelayer
+ [\v!head,\v!nexthead,\v!lefthead,\v!righthead]
+ [\c!x=\backspace,
+ \c!y=\topspace]
+
+\setupresumeframe
+ [\v!head,\v!nexthead,\v!lefthead,\v!righthead]
+ [\c!width=\textwidth]
+
+\setupresumelayer
+ [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot]
+ [\c!preset=\v!left\v!bottom,
+ \c!x=\backspace,
+ \c!y=\bottomspace]
+
+\setupresumeframe
+ [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot]
+ [\c!width=\textwidth,
+ \c!height=\footerheight]
+
+\setupresumelayer
+ [\v!nexthead,\v!nextfoot]
+ [\c!state=\v!next]
+
+\setupresumelayer
+ [\v!lefthead,\v!leftfoot]
+ [\c!state=\v!left]
+
+\setupresumelayer
+ [\v!righthead,\v!rightfoot]
+ [\c!state=\v!right]
+
+\setupresumesection
+ [\v!closing]
+ [\c!spaceafter=\v!line,
+ \c!spaceinbetween={\v!samepage,2*\v!line}]
+
+\setupresumeparagraph
+ [\v!two\v!columns]
+ [\c!n=2,
+ \c!alternative=\v!columns,
+ \c!distance=\emwidth]
+
+\setupresumeparagraph
+ [\v!two\v!columns:1]
+ [\c!alternative=\c!lefttext,
+ \c!width=6\emwidth]
+
+\setupresumeparagraph
+ [\v!two\v!columns:2]
+ [\c!alternative=\v!default,
+ \c!width=\dimexpr\textwidth-\namedresumeparagraphparameter{\v!two\v!columns:1}\c!width-\namedresumeparagraphparameter{\v!two\v!columns}\c!distance\relax]
+
+\setupresumeparagraph
+ [\v!three\v!columns]
+ [\c!n=3,
+ \c!alternative=\v!columns,
+ \c!distance=\emwidth]
+
+\setupresumeparagraph
+ [\v!three\v!columns:1]
+ [\c!alternative=\c!lefttext,
+ \c!width=6\emwidth]
+
+\setupresumeparagraph
+ [\v!three\v!columns:2]
+ [\c!alternative=\v!default,
+ \c!width=\dimexpr\textwidth-\namedresumeparagraphparameter{\v!three\v!columns:1}\c!width-\namedresumeparagraphparameter{\v!three\v!columns:3}\c!width-\namedresumeparagraphparameter{\v!three\v!columns}\c!distance*2\relax]
+
+\setupresumeparagraph
+ [\v!three\v!columns:3]
+ [\c!alternative=\c!righttext,
+ \c!width=6\emwidth]
+
+\defineresumeelements
+ [\v!layer]
+ [\v!resumemain,
+ \v!resumenext,
+ \v!head,
+ \v!nexthead,
+ \v!lefthead,
+ \v!righthead,
+ \v!foot,
+ \v!nextfoot,
+ \v!topmark,
+ \v!botmark,
+ \v!cutmark,
+ \v!endmark,
+ \v!usermark]
+
+\defineresumeelements
+ [\v!section]
+ [\v!content,
+ \v!closing]
+
+\endinput