From 84e510b58695d2baed3d2a83312e72efc5db9400 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Dec 2012 01:27:41 +0000 Subject: context-letter (8dec12) git-svn-id: svn://tug.org/texlive/trunk@28475 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/context/third/letter/base/s-cor-00.mkvi | 31 +++++++++++++++++----- .../tex/context/third/letter/base/s-cor-01.mkii | 5 +++- .../tex/context/third/letter/base/s-cor-01.mkvi | 5 +++- 3 files changed, 33 insertions(+), 8 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 891d8f503ab..f85ad6c73ac 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 @@ -300,8 +300,9 @@ % Layers -\installsimplecommandhandler \????correspondencelayer {correspondencelayer} \????correspondencelayer -\installsimpleframedcommandhandler \????correspondenceframe {correspondenceframe} \????correspondenceframe +\installsimplecommandhandler \????correspondencelayer {correspondencelayer} \????correspondencelayer +\installsimpleframedcommandhandler \????correspondenceframe {correspondenceframe} \????correspondenceframe +\installcommandhandler \????correspondencelayeralternative {correspondencelayeralternative} \????correspondencelayeralternative \unexpanded\def\correspondence_layer_define[#environment][#element]% {\def\currentcorrespondencelayer{#environment:#element}% @@ -406,7 +407,8 @@ % Sections -\installsimplecommandhandler \????correspondencesection {correspondencesection} \????correspondencesection +\installsimplecommandhandler \????correspondencesection {correspondencesection} \????correspondencesection +\installcommandhandler \????correspondencesectionalternative {correspondencesectionalternative} \????correspondencesectionalternative \unexpanded\def\correspondence_section_define[#environment][#element]% {\def\currentcorrespondencesection{#environment:#element}% @@ -463,7 +465,8 @@ % Descriptions -\installsimplecommandhandler \????correspondencedescription {correspondencedescription} \????correspondencedescription +\installsimplecommandhandler \????correspondencedescription {correspondencedescription} \????correspondencedescription +\installcommandhandler \????correspondencedescriptionalternative {correspondencedescriptionalternative} \????correspondencedescriptionalternative \let\m_correspondence_description_format\empty \let\m_correspondence_description_items \empty @@ -556,7 +559,8 @@ % Paragraphs -\installsimplecommandhandler \????correspondenceparagraph {correspondenceparagraph} \????correspondenceparagraph +\installsimplecommandhandler \????correspondenceparagraph {correspondenceparagraph} \????correspondenceparagraph +\installcommandhandler \????correspondenceparagraphalternative {correspondenceparagraphalternative} \????correspondenceparagraphalternative \newtoks\t_correspondence_paragraphs @@ -772,7 +776,8 @@ % Heading -\installframedcommandhandler \????correspondencehead {correspondencehead} \????correspondencehead +\installframedcommandhandler \????correspondencehead {correspondencehead} \????correspondencehead +\installcommandhandler \????correspondenceheadalternative {correspondenceheadalternative} \????correspondenceheadalternative \appendtoks \definelist [\currentcorrespondencehead]% \definelist [\????correspondenceheadlist \currentcorrespondencehead] @@ -877,6 +882,20 @@ % Elements +\unexpanded\def\correspondence_element_define[#environment][#type][#element][#name]% + {\edef\m_correspondence_element_type{#type}% + \ifx\m_correspondence_element_type\v!section + \expandafter\correspondence_element_define_section + \else + \expandafter\correspondence_element_define_layer + \fi} + +\def\correspondence_element_define_section[#environment][#type][#element][#name]#content% + {\definecorrespondencesectionalternative[#environment:#element:#name][\c!renderingsetup=\????correspondencesectionrenderings:\v!command]} + +\def\correspondence_element_define_layer[#environment][#type][#element][#name]#content% + {\definecorrespondencelayeralternative [#environment:#element:#name][\c!renderingsetup=\????correspondencelayerrenderings:\v!command]} + \unexpanded\def\correspondence_element_define[#environment][#type][#element][#name]#content% {\setvalue{\????correspondenceelement:#environment:#type:#element:#name}{#content}} 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 c72fe8bc7f1..18552d2cfdb 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.11.19, +%D version=2012.12.07, %D title=\CONTEXT\ User Module, %D subtitle=Letters, %D author=Wolfgang Schuster, @@ -124,6 +124,7 @@ \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color \correspondenceparameter\c!fromname \dostopattributes + \\ \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color \correspondenceparameter\c!fromaddress @@ -140,6 +141,7 @@ \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color \correspondenceparameter\c!fromname \dostopattributes + \\ \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color \correspondenceparameter\c!fromaddress @@ -156,6 +158,7 @@ \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color \correspondenceparameter\c!fromname \dostopattributes + \\ \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color \correspondenceparameter\c!fromaddress 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 870d1f7d73b..afed4881c58 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.11.19, +%D version=2012.12.07, %D title=\CONTEXT\ User Module, %D subtitle=Letters, %D author=Wolfgang Schuster, @@ -133,6 +133,7 @@ \usecorrespondencestylestyleandcolor\c!style\c!color \correspondenceparameter\c!fromname \endgroup + \\ \begingroup \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% \usecorrespondencestylestyleandcolor\c!style\c!color @@ -151,6 +152,7 @@ \usecorrespondencestylestyleandcolor\c!style\c!color \correspondenceparameter\c!fromname \endgroup + \\ \begingroup \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% \usecorrespondencestylestyleandcolor\c!style\c!color @@ -169,6 +171,7 @@ \usecorrespondencestylestyleandcolor\c!style\c!color \correspondenceparameter\c!fromname \endgroup + \\ \begingroup \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% \usecorrespondencestylestyleandcolor\c!style\c!color -- cgit v1.2.3