summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-27 22:11:25 +0000
committerKarl Berry <karl@freefriends.org>2012-08-27 22:11:25 +0000
commit9dc7b757050fc5b40b9ff6765f32865917dbecb2 (patch)
tree05fb265c87d25b02cb9ff504e3a6a4a995b8a177
parent299abb085bbfad1022a095ee22e1833364cba3a2 (diff)
context-letter (27aug12)
git-svn-id: svn://tug.org/texlive/trunk@27537 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/context/interface/third/t-letter.xml423
-rw-r--r--Master/texmf-dist/tex/context/interface/third/t-memo.xml377
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua8
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi179
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii2
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv2
-rw-r--r--Master/tlpkg/tlpsrc/context-letter.tlpsrc1
7 files changed, 952 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/context/interface/third/t-letter.xml b/Master/texmf-dist/tex/context/interface/third/t-letter.xml
new file mode 100644
index 00000000000..9138027b07d
--- /dev/null
+++ b/Master/texmf-dist/tex/context/interface/third/t-letter.xml
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2011.12.29">
+
+<cd:define name="letterlayer">
+ <cd:constant type="head"/>
+ <cd:constant type="nexthead"/>
+ <cd:constant type="lefthead"/>
+ <cd:constant type="righthead"/>
+ <cd:constant type="foot"/>
+ <cd:constant type="nextfoot"/>
+ <cd:constant type="leftfoot"/>
+ <cd:constant type="rightfoot"/>
+ <cd:constant type="address"/>
+ <cd:constant type="backaddress"/>
+ <cd:constant type="reference"/>
+ <cd:constant type="location"/>
+ <cd:constant type="topmark"/>
+ <cd:constant type="botmark"/>
+ <cd:constant type="cutmark"/>
+ <cd:constant type="endmark"/>
+ <cd:constant type="usermark"/>
+ <cd:constant type="lettermain"/>
+ <cd:constant type="letternext"/>
+</cd:define>
+
+<cd:define name="lettersection">
+ <cd:constant type="head"/>
+ <cd:constant type="date"/>
+ <cd:constant type="reference"/>
+ <cd:constant type="specialnotation"/>
+ <cd:constant type="address"/>
+ <cd:constant type="title"/>
+ <cd:constant type="subject"/>
+ <cd:constant type="opening"/>
+ <cd:constant type="content"/>
+ <cd:constant type="closing"/>
+ <cd:constant type="appendices"/>
+</cd:define>
+
+<cd:define name="letterdescription">
+ <cd:constant type="copy"/>
+ <cd:constant type="enclosure"/>
+ <cd:constant type="postscript"/>
+</cd:define>
+
+<cd:command name="defineletterelement" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="defineletterelement"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1">
+ <cd:constant type="layer"/>
+ <cd:constant type="section"/>
+ </cd:keywords>
+ <cd:keywords n="2">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:keywords n="3">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:content n="4"/>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="letterelement" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="letterelement"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1">
+ <cd:constant type="layer"/>
+ <cd:constant type="section"/>
+ </cd:keywords>
+ <cd:keywords n="2">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:keywords n="3">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupletter" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setupletter"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:assignments n="1" list="yes">
+ <cd:parameter name="KEY">
+ <cd:constant type="VALUE"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupletterdescription" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setupletterdescription"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:parameter name="spacebefore">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="spaceafter">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="spaceinbetween">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="headstyle">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="headcolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <!--
+ <cd:parameter name="textstyle">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="textcolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ -->
+ <cd:parameter name="width">
+ <cd:constant type="fit" default="yes"/>
+ <cd:constant type="broad"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="location">
+ <cd:constant type="left" default="yes"/>
+ <cd:constant type="top"/>
+ <cd:constant type="text"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupletterelements" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setupletterelements"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:keywords n="2" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupletterframe" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setupletterframe"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:inherit name="setupframe" n="2"/>
+ </cd:assignments>
+ </cd:arguments>
+</cd:interface>
+
+<cd:command name="setupletterlayer" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setupletterlayer"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:parameter name="x">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="y">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="preset">
+ <cd:constant type="lefttop"/>
+ <cd:constant type="righttop"/>
+ <cd:constant type="leftbottom"/>
+ <cd:constant type="rightbottom"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="middletop"/>
+ <cd:constant type="middlebottom"/>
+ <cd:constant type="middleleft"/>
+ <cd:constant type="middleright"/>
+ </cd:parameter>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="next"/>
+ <cd:constant type="repeat"/>
+ <cd:constant type="left"/>
+ <cd:constant type="right"/>
+ <cd:constant type="even"/>
+ <cd:constant type="odd"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargin">
+ <cd:constant type="standard"/>
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargin">
+ <cd:constant type="standard"/>
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="list">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:parameter name="separator">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupletterlayout" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setupletterlayout"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:inherit name="setuplayout" n="2"/>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupletteroptions" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setupletteroptions"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:assignments n="1" list="yes">
+ <cd:parameter name="bodyfont">
+ <cd:inherit name="setupbodyfont"/>
+ </cd:parameter>
+ <cd:parameter name="whitespace">
+ <cd:inherit name="setupwhitespace"/>
+ </cd:parameter>
+ <cd:parameter name="backgroundcolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="backgroundimage">
+ <cd:constant type="cd:file"/>
+ </cd:parameter>
+ <cd:parameter name="background">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="indenting">
+ <cd:inherit name="setupindenting"/>
+ </cd:parameter>
+ <cd:parameter name="marking">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="position">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="option">
+ <cd:constant type="test"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setuplettersection" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setuplettersection"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:parameter name="spacebefore">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="spaceafter">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="spaceinbetween">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargin">
+ <cd:constant type="standard"/>
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargin">
+ <cd:constant type="standard"/>
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="indenting">
+ <cd:inherit name="setupindenting" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="separator">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupletterstyle" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="setupletterstyle"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:parameter name="style">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="titlestyle">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="titlecolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="textstyle">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="textcolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="separator">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="letter" type="environment" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="letter"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:assignments n="1" list="yes" optional="yes">
+ <cd:inherit name="setupletter" n="1"/>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="useletterstyle" file="s-cor-01.mkvi">
+ <cd:sequence>
+ <cd:string value="useletterstyle"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:file"/>
+ </cd:keywords>
+ </cd:arguments>
+</cd:command>
+
+</cd:interface> \ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/interface/third/t-memo.xml b/Master/texmf-dist/tex/context/interface/third/t-memo.xml
new file mode 100644
index 00000000000..5ec75281254
--- /dev/null
+++ b/Master/texmf-dist/tex/context/interface/third/t-memo.xml
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2011.12.29">
+
+<cd:command name="definememoelement" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="definememoelement"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1">
+ <cd:constant type="layer"/>
+ <cd:constant type="section"/>
+ </cd:keywords>
+ <cd:keywords n="2">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:keywords n="3">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:content n="4"/>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="memoelement" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="memoelement"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1">
+ <cd:constant type="layer"/>
+ <cd:constant type="section"/>
+ </cd:keywords>
+ <cd:keywords n="2">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:keywords n="3">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupmemo" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemo"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:assignments n="1" list="yes">
+ <cd:parameter name="KEY">
+ <cd:constant type="VALUE"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupmemodescription" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemodescription"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:parameter name="spacebefore">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="spaceafter">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="spaceinbetween">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="headstyle">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="headcolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <!--
+ <cd:parameter name="textstyle">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="textcolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ -->
+ <cd:parameter name="width">
+ <cd:constant type="fit" default="yes"/>
+ <cd:constant type="broad"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="location">
+ <cd:constant type="left" default="yes"/>
+ <cd:constant type="top"/>
+ <cd:constant type="text"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupmemoelements" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemoelements"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:keywords n="2" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupmemoframe" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemoframe"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:inherit name="setupframe" n="2"/>
+ </cd:assignments>
+ </cd:arguments>
+</cd:interface>
+
+<cd:command name="setupmemolayer" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemolayer"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:parameter name="x">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="y">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="preset">
+ <cd:constant type="lefttop"/>
+ <cd:constant type="righttop"/>
+ <cd:constant type="leftbottom"/>
+ <cd:constant type="rightbottom"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="middletop"/>
+ <cd:constant type="middlebottom"/>
+ <cd:constant type="middleleft"/>
+ <cd:constant type="middleright"/>
+ </cd:parameter>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="next"/>
+ <cd:constant type="repeat"/>
+ <cd:constant type="left"/>
+ <cd:constant type="right"/>
+ <cd:constant type="even"/>
+ <cd:constant type="odd"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargin">
+ <cd:constant type="standard"/>
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargin">
+ <cd:constant type="standard"/>
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="list">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:parameter name="separator">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupmemolayout" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemolayout"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:inherit name="setuplayout" n="2"/>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupmemooptions" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemooptions"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:assignments n="1" list="yes">
+ <cd:parameter name="bodyfont">
+ <cd:inherit name="setupbodyfont"/>
+ </cd:parameter>
+ <cd:parameter name="whitespace">
+ <cd:inherit name="setupwhitespace"/>
+ </cd:parameter>
+ <cd:parameter name="backgroundcolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="backgroundimage">
+ <cd:constant type="cd:file"/>
+ </cd:parameter>
+ <cd:parameter name="background">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="indenting">
+ <cd:inherit name="setupindenting"/>
+ </cd:parameter>
+ <cd:parameter name="marking">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="option">
+ <cd:constant type="test"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupmemosection" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemosection"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:parameter name="spacebefore">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="spaceafter">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="spaceinbetween">
+ <cd:inherit name="blank" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargin">
+ <cd:constant type="standard"/>
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargin">
+ <cd:constant type="standard"/>
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="indenting">
+ <cd:inherit name="setupindenting" n="1"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="separator">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="setupmemostyle" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="setupmemostyle"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments n="2" list="yes">
+ <cd:parameter name="style">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="titlestyle">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="titlecolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="textstyle">
+ <cd:resolve name="style"/>
+ </cd:parameter>
+ <cd:parameter name="textcolor">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="separator">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="memo" type="environment" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="memo"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:assignments n="1" list="yes" optional="yes">
+ <cd:inherit name="setupmemo" n="1"/>
+ </cd:assignments>
+ </cd:arguments>
+</cd:command>
+
+<cd:command name="usememostyle" file="s-cor-02.mkvi">
+ <cd:sequence>
+ <cd:string value="usememostyle"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords n="1" list="yes">
+ <cd:constant type="cd:file"/>
+ </cd:keywords>
+ </cd:arguments>
+</cd:command>
+
+</cd:interface> \ No newline at end of file
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 5b958f547b2..62ff67ed2e3 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
@@ -41,6 +41,7 @@ local v_page = variables.page
local v_paper = variables.paper
local v_text = variables.text
local v_start = variables.start
+local v_list = variables.list
-- list for the elements to be shown
@@ -290,12 +291,15 @@ function correspondence.letter.reference_e(environment,list)
end )
end
-function thirddata.correspondence.description_split(list)
+function correspondence.description_split(list)
local format, items = nil, nil
if string.find(list,":") then
format, items = string.splitup(list,":")
+ if format ~= v_list then
+ items = list
+ end
else
- items = list
+ items = list
end
-- the macros are empty be default, change this only when necessary
context.unprotect()
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 d3506bf7eef..a21c1d84b3d 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.06.10,
+%D version=2012.08.26,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -487,7 +487,8 @@
{\scratchdimen}
{\unhcopy\scratchbox}
{\correspondencedescriptionparameter\c!distance}%
- \ctxlua{thirddata.correspondence.description_split("\correspondencedescriptionparameter\c!textcommand")}%
+ \edef\p_correspondence_description_textcommand{\detokenize\expandafter{\correspondencedescriptionparameter\c!textcommand}}%
+ \ctxlua{thirddata.correspondence.description_split(\!!bs\correspondencedescriptionparameter\c!textcommand\!!es)}%
\expandcheckedcsname\????correspondencedescriptionlocation{\correspondencedescriptionparameter\c!location}\v!left
\correspondencedescriptionparameter\c!after
\doifsomethingelse{\correspondencedescriptionparameter\c!spaceafter}{\blank[\correspondencedescriptionparameter\c!spaceafter]}\endgraf
@@ -575,9 +576,9 @@
\unexpanded\def\correspondence_paragraph_beg[#environment][#element]%
{\begingroup
\correspondence_parameters{#environment}{#element}\v!paragraph
- \dosingleempty\correspondence_paragraph_beg_parameters}%
+ \dodoubleempty\correspondence_paragraph_beg_parameters}%
-\unexpanded\def\correspondence_paragraph_beg_parameters[#parameters]%
+\unexpanded\def\correspondence_paragraph_beg_parameters[#parameters][#dummy]% #dummy removes the linebreak before the first line
{\iffirstargument
\setupcurrentcorrespondenceparagraph[#parameters]%
\fi
@@ -595,7 +596,62 @@
\doifsomethingelse{\correspondenceparagraphparameter\c!spaceafter }{\blank[\correspondenceparagraphparameter\c!spaceafter ]}\endgraf
\endgroup}
-\unexpanded\def\correspondence_paragraph_lefttext
+% \unexpanded\def\correspondence_paragraph_lefttext
+% {\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]
+% {\correspondenceparagraphparameter\c!lefttext}%
+% \fi}
+%
+% \unexpanded\def\correspondence_paragraph_righttext
+% {\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]
+% {\correspondenceparagraphparameter\c!righttext}%
+% \fi}
+
+\unexpanded\def\correspondence_paragraph_text
+ {\edef\p_correspondence_paragraph_text{\correspondenceparagraphparameter\c!text}%
+ \ifx\p_correspondence_paragraph_text\empty \else
+ %\correspondence_paragraph_lefttext % margin texts are only placed when there is normal text,
+ %\correspondence_paragraph_righttext % for margin only texts one can use “left”, “right” or “both”
+ \begingroup
+ \usecorrespondenceparagraphstyleandcolor\c!textstyle\c!textcolor
+ \correspondenceparagraphparameter\c!text
+ \endgraf
+ \endgroup
+ \fi}
+
+\setvalue{\????correspondenceparagraphalternative\s!default}%
+ {\getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
+
+% \setvalue{\????correspondenceparagraphalternative\v!left}%
+% {\correspondence_paragraph_lefttext
+% \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
+%
+% \setvalue{\????correspondenceparagraphalternative\v!right}%
+% {\correspondence_paragraph_righttext
+% \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
+%
+% \setvalue{\????correspondenceparagraphalternative\v!both}%
+% {\correspondence_paragraph_lefttext
+% \correspondence_paragraph_righttext
+% \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
+
+\setvalue{\????correspondenceparagraphalternative\v!top}%
+ {\correspondence_paragraph_text
+ \doifsomethingelse{\correspondenceparagraphparameter\c!spaceinbetween}{\blank[\correspondenceparagraphparameter\c!spaceinbetween]}{\dosomebreak\nobreak}%
+ \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
+
+\unexpanded\def\correspondence_paragraph_leftmargin
{\edef\p_correspondence_paragraph_lefttext{\correspondenceparagraphparameter\c!lefttext}%
\ifx\p_correspondence_paragraph_lefttext\empty \else
\margindata
@@ -603,10 +659,10 @@
[\c!style=\correspondenceparagraphparameter\c!leftstyle,
\c!color=\correspondenceparagraphparameter\c!leftcolor]
[\c!align=\correspondenceparagraphparameter\c!leftalign]
- {\correspondenceparagraphparameter\c!lefttext}%
+ {\p_correspondence_paragraph_lefttext}%
\fi}
-\unexpanded\def\correspondence_paragraph_righttext
+\unexpanded\def\correspondence_paragraph_rightmargin
{\edef\p_correspondence_paragraph_righttext{\correspondenceparagraphparameter\c!righttext}%
\ifx\p_correspondence_paragraph_righttext\empty \else
\margindata
@@ -614,40 +670,87 @@
[\c!style=\correspondenceparagraphparameter\c!rightstyle,
\c!color=\correspondenceparagraphparameter\c!rightcolor]
[\c!align=\correspondenceparagraphparameter\c!rightalign]
- {\correspondenceparagraphparameter\c!righttext}%
+ {\p_correspondence_paragraph_righttext}%
\fi}
-\unexpanded\def\correspondence_paragraph_text
- {\edef\p_correspondence_paragraph_text{\correspondenceparagraphparameter\c!text}%
- \ifx\p_correspondence_paragraph_text\empty \else
- \correspondence_paragraph_lefttext % margin texts are only placed when there is normal text,
- \correspondence_paragraph_righttext % for margin only texts one can use “left”, “right” or “both”
- \begingroup
- \usecorrespondenceparagraphstyleandcolor\c!textstyle\c!textcolor
- \correspondenceparagraphparameter\c!text
- \endgraf
- \endgroup
- \fi}
-
-\setvalue{\????correspondenceparagraphalternative\s!default}%
- {\getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
-
-\setvalue{\????correspondenceparagraphalternative\v!left}%
- {\correspondence_paragraph_lefttext
+\setvalue{\????correspondenceparagraphalternative\v!margin}%
+ {\correspondence_paragraph_leftmargin
+ \correspondence_paragraph_rightmargin
\getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
-\setvalue{\????correspondenceparagraphalternative\v!right}%
- {\correspondence_paragraph_righttext
- \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
+% \unexpanded\def\correspondence_paragraph_leftcolumn
+% {\ifzeropt\p_correspondence_paragraph_leftwidth \else
+% \vtop\bgroup
+% \hsize\p_correspondence_paragraph_leftwidth
+% \usecorrespondenceparagraphstyleandcolor\c!leftstyle\c!leftcolor
+% \begstrut\correspondenceparagraphparameter\c!lefttext\endstrut
+% \egroup
+% \hskip\p_correspondence_paragraph_leftmargin
+% \fi}
+%
+% \unexpanded\def\correspondence_paragraph_middlecolumn
+% {\vtop\bgroup
+% \hsize\dimexpr\hsize
+% \ifzeropt\p_correspondence_paragraph_leftwidth \relax \else - \dimexpr\p_correspondence_paragraph_leftwidth + \p_correspondence_paragraph_rightwidth \relax \fi
+% \ifzeropt\p_correspondence_paragraph_leftmargin\relax \else - \dimexpr\p_correspondence_paragraph_leftmargin + \p_correspondence_paragraph_rightmargin \relax \fi
+% \relax
+% \usecorrespondenceparagraphstyleandcolor\c!style\c!color
+% \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]%
+% \egroup}
+%
+% \unexpanded\def\correspondence_paragraph_rightcolumn
+% {\ifzeropt\p_correspondence_paragraph_rightwidth \else
+% \hskip\p_correspondence_paragraph_rightmargin
+% \vtop\bgroup
+% \hsize\p_correspondence_paragraph_rightwidth
+% \usecorrespondenceparagraphstyleandcolor\c!rightstyle\c!rightcolor
+% \begstrut\correspondenceparagraphparameter\c!righttext\endstrut
+% \egroup
+% \fi}
+%
+% \setvalue{\????correspondenceparagraphalternative\v!columns}%
+% {\edef\p_correspondence_paragraph_leftwidth {\correspondenceparagraphparameter\c!leftwidth }%
+% \edef\p_correspondence_paragraph_rightwidth {\correspondenceparagraphparameter\c!rightwidth }%
+% \edef\p_correspondence_paragraph_leftmargin {\correspondenceparagraphparameter\c!leftmargin }%
+% \edef\p_correspondence_paragraph_rightmargin{\correspondenceparagraphparameter\c!rightmargin}%
+% \dontleavehmode\hbox to \hsize\bgroup
+% \correspondence_paragraph_leftcolumn
+% \correspondence_paragraph_middlecolumn
+% \correspondence_paragraph_rightcolumn
+% \hss\egroup}
+
+\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}
-\setvalue{\????correspondenceparagraphalternative\v!both}%
- {\correspondence_paragraph_lefttext
- \correspondence_paragraph_righttext
- \getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
+\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}
-\setvalue{\????correspondenceparagraphalternative\v!top}%
- {\correspondence_paragraph_text
- \doifsomethingelse{\correspondenceparagraphparameter\c!spaceinbetween}{\blank[\correspondenceparagraphparameter\c!spaceinbetween]}{\dosomebreak\nobreak}%
+\setvalue{\????correspondenceparagraphalternative\v!columns}%
+ {\dontleavehmode
+ \correspondence_paragraph_leftcolumn
+ \correspondence_paragraph_rightcolumn
\getbufferdata[\????correspondenceparagraphbuffer\currentcorrespondenceparagraph]}
\setupcorrespondenceparagraph
@@ -655,7 +758,11 @@
\c!spaceafter=\v!line,
\c!alternative=\s!default,
\c!leftalign=\v!flushleft,
- \c!rightalign=\v!flushleft]
+ \c!rightalign=\v!flushleft,
+ \c!leftwidth=\zeropoint,
+ \c!rightwidth=\zeropoint,
+ \c!leftmargin=\zeropoint,
+ \c!rightmargin=\zeropoint]
% Heading
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii
index ab087d764b2..c8342ae332e 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=letter-imp-knuth,
-%D version=2012.12.26,
+%D version=2011.12.26,
%D title=\CONTEXT\ User Module,
%D subtitle=Knuth letter style,
%D author=Wolfgang Schuster,
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv
index ab087d764b2..c8342ae332e 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv
@@ -1,6 +1,6 @@
%D \module
%D [ file=letter-imp-knuth,
-%D version=2012.12.26,
+%D version=2011.12.26,
%D title=\CONTEXT\ User Module,
%D subtitle=Knuth letter style,
%D author=Wolfgang Schuster,
diff --git a/Master/tlpkg/tlpsrc/context-letter.tlpsrc b/Master/tlpkg/tlpsrc/context-letter.tlpsrc
index 80e71c2e536..563d6ba3d0b 100644
--- a/Master/tlpkg/tlpsrc/context-letter.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-letter.tlpsrc
@@ -1,2 +1,3 @@
category ConTeXt
+runpattern +f texmf-dist/tex/context/interface/third/t-memo.xml
depend context