From 08211c4ab44918f26506507b20b57127f3b6af2a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Dec 2011 23:00:38 +0000 Subject: context-letter (25dec11) git-svn-id: svn://tug.org/texlive/trunk@24944 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/context/third/letter/base/s-cor-00.lua | 4 +- .../tex/context/third/letter/base/s-cor-00.mkii | 16 +-- .../tex/context/third/letter/base/s-cor-00.mkvi | 55 +++++---- .../tex/context/third/letter/base/s-cor-01.mkii | 116 +++++++++++++++---- .../tex/context/third/letter/base/s-cor-01.mkvi | 128 ++++++++++++++++++--- .../tex/context/third/letter/base/s-cor-02.mkii | 2 +- .../tex/context/third/letter/base/s-cor-02.mkvi | 6 +- .../third/letter/style/letter-imp-blockstyle.mkii | 62 ++++++++++ .../third/letter/style/letter-imp-blockstyle.mkiv | 62 ++++++++++ .../third/letter/style/letter-imp-default.mkii | 2 +- .../third/letter/style/letter-imp-default.mkiv | 2 +- .../third/letter/style/letter-imp-fullblock.mkii | 52 +++++++++ .../third/letter/style/letter-imp-fullblock.mkiv | 52 +++++++++ .../third/letter/style/letter-imp-hanging.mkii | 61 ++++++++++ .../third/letter/style/letter-imp-hanging.mkiv | 61 ++++++++++ .../third/letter/style/letter-imp-modified.mkii | 56 +++++++++ .../third/letter/style/letter-imp-modified.mkiv | 56 +++++++++ .../third/letter/style/letter-imp-semiblock.mkii | 57 +++++++++ .../third/letter/style/letter-imp-semiblock.mkiv | 57 +++++++++ .../third/letter/style/letter-imp-simplified.mkii | 65 +++++++++++ .../third/letter/style/letter-imp-simplified.mkiv | 65 +++++++++++ .../third/letter/style/letter-imp-swiss.mkiv | 5 +- .../third/letter/style/letter-imp-swissleft.mkiv | 5 +- .../third/letter/style/letter-imp-test.mkiv | 48 -------- 24 files changed, 972 insertions(+), 123 deletions(-) create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkii create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkiv create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii create mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv delete mode 100644 Master/texmf-dist/tex/context/third/letter/style/letter-imp-test.mkiv 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 d46887a2242..a4c99ec7744 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 @@ -102,7 +102,7 @@ function correspondence.place(environment,settings) local whitespace = settings.whitespace local backgroundcolor = settings.backgroundcolor context.unprotect() - context(toks.everybeforecorrespondence) + context(toks.t_correspondence_before) context.page() -- page layout is controlled with the \setup…layout commands context.setuplayout{ method = v_correspondence } @@ -143,7 +143,7 @@ function correspondence.place(environment,settings) context.resetsubpagenumber() -- make sure the normal layout is restored context.setuplayout{v_reset} - context(toks.everyaftercorrespondence) + context(toks.t_correspondence_after) context.protect() end diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii index 7f338a9fc5d..436e031a91b 100644 --- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii +++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii @@ -1,6 +1,6 @@ %D \module %D [ file=s-cor-00, -%D version=2011.12.06, +%D version=2011.12.22, %D title=\CONTEXT\ User Module, %D subtitle=Correspondence, %D author=Wolfgang Schuster, @@ -48,6 +48,7 @@ \setinterfaceconstant {fromfax} {fromfax} \setinterfaceconstant {frommail} {frommail} \setinterfaceconstant {fromurl} {fromurl} + \setinterfaceconstant {salutation} {salutation} \stopinterface \startinterface all @@ -109,6 +110,7 @@ \setinterfacevariable {semiblock} {semiblock} \setinterfacevariable {simplified} {simplified} \setinterfacevariable {modified} {modified} + \setinterfacevariable {blockstyle} {blockstyle} \stopinterface % Messages @@ -170,9 +172,9 @@ \def\namedcorrespondenceparameter#1#2% {\csname\ifcsname\????correspondence#1#2\endcsname\????correspondence#1#2\else\s!empty\fi\endcsname} -\unexpanded\def\setupcorrespondence[#1][#2]% +\unexpanded\def\setupcorrespondence[#1]% {\def\currentcorrespondence{#1}% - \setupcurrentcorrespondence[#2]} + \setupcurrentcorrespondence} \unexpanded\def\setupcurrentcorrespondence {\getparameters[\????correspondence\currentcorrespondence]} @@ -262,7 +264,7 @@ \setupcurrentcorrespondencelayer[\s!parent=\????correspondencelayer,\c!state=\v!start,\c!alternative=\s!default,\c!distance=\lineheight,\c!separator=\crlf]% \setupcurrentcorrespondenceframe[\s!parent=\????correspondenceframe,\c!frame=\v!off,\c!offset=\zeropoint,\c!align=\v!right]% \definelayer [#1:#2][\c!width=\overlaywidth,\c!height=\overlayheight]% - \defineoverlay[#1:#2][{\placecorrespondencelayer[#1][#2]}]} + \defineoverlay[#1:#2][\placecorrespondencelayer{#1}{#2}]} \newtoks\everysetupcorrespondencelayer @@ -283,7 +285,7 @@ \setvalue{correspondence_layer_state_\v!even }{\!!doneafalse \!!donebfalse \!!donectrue } \setvalue{correspondence_layer_state_\v!odd }{\!!doneafalse \!!donebtrue \!!donecfalse} -\unexpanded\def\placecorrespondencelayer[#1][#2]% +\unexpanded\def\placecorrespondencelayer#1#2% {\correspondenceparameters{#1}{#2}\v!layer \executeifdefined{correspondence_layer_state_\correspondencelayerparameter\c!state}{\getvalue{correspondence_layer_state_\v!stop}} \ifnum\correspondencepage=\plusone @@ -372,9 +374,9 @@ \def\namedcorrespondenceoptionparameter#1#2% {\csname\ifcsname\????correspondenceoption#1#2\endcsname\????correspondenceoption#1#2\else\s!empty\fi\endcsname} -\unexpanded\def\setupcorrespondenceoption[#1][#2]% +\unexpanded\def\setupcorrespondenceoption[#1]% {\edef\currentcorrespondenceoption{#1}% - \setupcurrentcorrespondenceoption[#2]}% + \setupcurrentcorrespondenceoption}% \unexpanded\def\setupcurrentcorrespondenceoption {\getparameters[\????correspondenceoption\currentcorrespondenceoption]} 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 476858c56ea..a7648dfae17 100644 --- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi +++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi @@ -1,6 +1,6 @@ %D \module %D [ file=s-cor-00, -%D version=2011.12.02, +%D version=2011.12.24, %D title=\CONTEXT\ User Module, %D subtitle=Correspondence, %D author=Wolfgang Schuster, @@ -52,6 +52,7 @@ \setinterfaceconstant {fromfax} {fromfax} \setinterfaceconstant {frommail} {frommail} \setinterfaceconstant {fromurl} {fromurl} + \setinterfaceconstant {salutation} {salutation} \stopinterface \startinterface all @@ -113,6 +114,7 @@ \setinterfacevariable {semiblock} {semiblock} \setinterfacevariable {simplified} {simplified} \setinterfacevariable {modified} {modified} + \setinterfacevariable {blockstyle} {blockstyle} \stopinterface % Messages @@ -162,9 +164,9 @@ % Setup -\unexpanded\def\correspondence_setup[#environment][#parameters]% +\unexpanded\def\correspondence_setup[#environment]% {\edef\currentcorrespondence{#environment}% - \setupcurrentcorrespondence[#parameters]} + \setupcurrentcorrespondence} \appendtoks \setuevalue{\e!setup\currentcorrespondence\e!endsetup}{\dodoubleargument\correspondence_setup[\currentcorrespondence]}% @@ -172,8 +174,8 @@ % Placement -\newtoks\everybeforecorrespondence -\newtoks\everyaftercorrespondence +\newtoks\t_correspondence_before +\newtoks\t_correspondence_after \unexpanded\def\correspondence_place[#environment]% {\begingroup @@ -186,9 +188,20 @@ } )}% \endgroup} +%D Besides the normal letter environment there are three different ways to flush +%D the content of a letter after the text was set with a buffer etc. +%D +%D \startitemize +%D \item \type{\setups[letter:place]} +%D \item \type{\placeletter} +%D \item \type{\placecorrespondence[letter]} +%D \stopitemize + +\let\placecorrespondence\correspondence_place + \appendtoks - \global\correspondence_page\zerocount -\to \everybeforecorrespondence + \global\c_correspondence_page\zerocount +\to \t_correspondence_before \appendtoks \setuevalue{\e!place\currentcorrespondence}{\correspondence_place[\currentcorrespondence]}% @@ -205,10 +218,10 @@ \unexpanded\def\correspondence_layer_define[#environment][#element]% {\def\currentcorrespondencelayer{#environment:#element}% \let\currentcorrespondenceframe\currentcorrespondencelayer - \letcorrespondencelayerparameter\s!parent\????correspondencelayer - \letcorrespondenceframeparameter\s!parent\????correspondenceframe + \checkcorrespondencelayerparent + \checkcorrespondenceframeparent \definelayer [\currentcorrespondencelayer][\c!width=\overlaywidth,\c!height=\overlayheight]% - \defineoverlay[\currentcorrespondencelayer][{\correspondence_layer_place[#environment][#element]}]} + \defineoverlay[\currentcorrespondencelayer][\correspondence_layer_place{#environment}{#element}]} \unexpanded\def\correspondence_layer_setup[#environment][#elements][#parameters]% {\def\correspondence_layer_command#element% @@ -240,12 +253,12 @@ \setvalue{correspondence_layer_state_\v!even }{\!!doneafalse \!!donebfalse \!!donectrue } \setvalue{correspondence_layer_state_\v!odd }{\!!doneafalse \!!donebtrue \!!donecfalse} -\unexpanded\def\correspondence_layer_place[#environment][#element]% +\unexpanded\def\correspondence_layer_place#environment#element% {\correspondence_parameters{#environment}{#element}\v!layer \expandcheckedcsname{correspondence_layer_state_}{\correspondencelayerparameter\c!state}\v!stop - \ifnum\correspondence_page=\plusone + \ifnum\c_correspondence_page=\plusone \if!!donea\correspondence_layer_direct\fi - \else\ifodd\correspondence_page + \else\ifodd\c_correspondence_page \if!!doneb\correspondence_layer_direct\fi \else \if!!donec\correspondence_layer_direct\fi @@ -287,7 +300,7 @@ \unexpanded\def\correspondence_section_define[#environment][#element]% {\def\currentcorrespondencesection{#environment:#element}% - \letcorrespondencesectionparameter\s!parent\????correspondencesection} + \checkcorrespondencesectionparent} \unexpanded\def\correspondence_section_setup[#environment][#elements][#parameters]% {\def\correspondence_section_command#element% @@ -326,9 +339,9 @@ \installnamespace {correspondenceoption} \installsimplecommandhandler \????correspondenceoption {correspondenceoption} \????correspondenceoption -\unexpanded\def\correspondence_option_setup[#environment][#parameters]% +\unexpanded\def\correspondence_option_setup[#environment]% {\edef\currentcorrespondenceoption{#environment}% - \setupcurrentcorrespondenceoption[#parameters]}% + \setupcurrentcorrespondenceoption}% \defineoverlay [correspondence:backgroundimage] @@ -346,7 +359,7 @@ \unexpanded\def\correspondence_description_define[#environment][#element]% {\def\currentcorrespondencedescription{#environment:#element}% - \letcorrespondencedescriptionparameter\s!parent\????correspondencedescription} + \checkcorrespondencedescriptionparent} \unexpanded\def\correspondence_description_setup[#environment][#elements][#parameters]% {\def\correspondence_description_command#element% @@ -441,15 +454,15 @@ %D \item rightpage. %D \stopitemize -\newcount\correspondence_page +\newcount\c_correspondence_page \ifdefined\changetolayout \else \let\changetolayout\page_layouts_change \fi \installlayoutmethod \v!correspondence - {\global\advance\correspondence_page\plusone - \ifnum\correspondence_page=\plusone + {\global\advance\c_correspondence_page\plusone + \ifnum\c_correspondence_page=\plusone \changetolayout{\currentcorrespondence:\v!firstpage}% - \else\ifodd\correspondence_page + \else\ifodd\c_correspondence_page \changetolayout{\currentcorrespondence:\v!rightpage}% \else \changetolayout{\currentcorrespondence:\v!leftpage }% 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 79f7b29b0dc..50a11e5b475 100644 --- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii +++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii @@ -1,6 +1,6 @@ %D \module %D [ file=s-cor-01, -%D version=2011.12.05, +%D version=2011.12.24, %D title=\CONTEXT\ User Module, %D subtitle=Letters, %D author=Wolfgang Schuster, @@ -57,13 +57,12 @@ \def\defineletterelement {\doquadrupleargument\definecorrespondenceelement [\v!letter]} \def\letterelement {\doquadrupleargument\placecorrespondenceelement [\v!letter]} -\def\namedletterlayerparameter#1#2{\namedcorrespondencelayerparameter{\v!letter:#1}{#2}} -\def\namedletterframeparameter#1#2{\namedcorrespondenceframeparameter{\v!letter:#1}{#2}} +\def\namedletterlayerparameter#1{\namedcorrespondencelayerparameter{\v!letter:#1}} +\def\namedletterframeparameter#1{\namedcorrespondenceframeparameter{\v!letter:#1}} % Layers \defineletterlayer [\v!head] -\defineletterlayer [\v!firsthead] \defineletterlayer [\v!nexthead] \defineletterlayer [\v!lefthead] \defineletterlayer [\v!righthead] @@ -90,6 +89,11 @@ % Section +\definelettersection [\v!head] +\definelettersection [\v!date] +\definelettersection [\v!reference] +\definelettersection [\v!specialnotation] +\definelettersection [\v!address] \definelettersection [\v!title] \definelettersection [\v!subject] \definelettersection [\v!opening] @@ -166,11 +170,6 @@ \letterelement[\v!layer][\v!head][\correspondencelayerparameter\c!alternative] \stopsetups -\startsetups[\v!letter:\v!layer:\v!firsthead] -\def\\{\correspondencelayerparameter\c!separator} -\letterelement[\v!layer][\v!firsthead][\correspondencelayerparameter\c!alternative] -\stopsetups - \defineletterelement[\v!layer][\v!nexthead][\v!gbrief] {\maxaligned {\rlap{\correspondenceparameter\c!fromname} @@ -381,6 +380,83 @@ \letterelement[\v!layer][\v!location][\correspondencelayerparameter\c!alternative] \stopsetups +\startsetups[\v!letter:\v!layer:\v!topmark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!topmark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!botmark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!botmark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!cutmark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!cutmark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!endmark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!endmark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!usermark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!usermark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!lettermain] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!lettermain][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!letternext] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!letternext][\correspondencelayerparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!head][\v!blockstyle] + {\correspondenceparameter\c!fromaddress} + +\startsetups[\v!letter:\v!section:\v!head] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!head][\correspondencesectionparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!date][\v!blockstyle] + {\correspondenceparameter\c!date} + +\startsetups[\v!letter:\v!section:\v!date] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!date][\correspondencesectionparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!reference][\v!blockstyle] + {\correspondenceparameter\c!reference} + +\startsetups[\v!letter:\v!section:\v!reference] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!reference][\correspondencesectionparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!specialnotation][\v!blockstyle] + {\correspondenceparameter\c!dispatch} + +\startsetups[\v!letter:\v!section:\v!specialnotation] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!specialnotation][\correspondencesectionparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!address][\v!blockstyle] + {\correspondenceparameter\c!toname + \doifsomething{\correspondenceparameter\c!toname}\\ + \correspondenceparameter\c!toaddress} + +\startsetups[\v!letter:\v!section:\v!address] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!address][\correspondencesectionparameter\c!alternative] +\stopsetups + \defineletterelement[\v!section][\v!title][\s!default] {\doifsomethingelse{\correspondenceparameter\c!title} {\correspondenceparameter\c!title} @@ -520,7 +596,7 @@ \setuplettertext[\s!en][\v!yourref=Your ref.] \setuplettertext[\s!nl][\v!yourref=Uw kenmerk] \setuplettertext[\s!de][\v!yourref=Ihr Zeichen] -\setuplettertext[\s!fr][\v!yourref=Vos références] +\setuplettertext[\s!fr][\v!yourref=Vos r\eacute f\eacute rences] \setuplettertext[\s!it][\v!yourref=Vs./Rif.] \setuplettertext[\s!es][\v!yourref=Su ref.] @@ -538,7 +614,7 @@ \setuplettertext[\s!en][\v!myref=Our ref.] \setuplettertext[\s!nl][\v!myref=Ons kenmerk] \setuplettertext[\s!de][\v!myref=Unser Zeichen] -\setuplettertext[\s!fr][\v!myref=Nos références] +\setuplettertext[\s!fr][\v!myref=Nos r\eacute f\eacute rences] \setuplettertext[\s!it][\v!myref=Ns./Rif.] \setuplettertext[\s!es][\v!myref=Nuestra ref.] @@ -556,7 +632,7 @@ \setuplettertext[\s!en][\v!customer=Customer no.] \setuplettertext[\s!nl][\v!customer=Klant No.] \setuplettertext[\s!de][\v!customer=Kundennummer] -\setuplettertext[\s!fr][\v!customer=Numéro de client] +\setuplettertext[\s!fr][\v!customer=Num\eacute ro de client] \setuplettertext[\s!it][\v!customer=Nr.~cliente] \setuplettertext[\s!es][\v!customer=No. de cliente] @@ -565,7 +641,7 @@ \setuplettertext[\s!en][\v!invoice=Invoice no.] \setuplettertext[\s!nl][\v!invoice=Rekening No.] \setuplettertext[\s!de][\v!invoice=Rechnungsnummer] -\setuplettertext[\s!fr][\v!invoice=Numéro de facture] +\setuplettertext[\s!fr][\v!invoice=Num\eacute ro de facture] \setuplettertext[\s!it][\v!invoice=Nr.~fattura] \setuplettertext[\s!es][\v!invoice=No. de factura] @@ -592,7 +668,7 @@ \setuplettertext[\s!en][\v!copy=cc] \setuplettertext[\s!nl][\v!copy=Kopie aan] \setuplettertext[\s!de][\v!copy=Kopien an] -\setuplettertext[\s!fr][\v!copy=Copieà] +\setuplettertext[\s!fr][\v!copy=Copie\agrave] \setuplettertext[\s!it][\v!copy=Per conoscenza] \setuplettertext[\s!es][\v!copy=Copias] @@ -610,7 +686,7 @@ \setuplettertext[\s!en][\v!to=To] \setuplettertext[\s!nl][\v!to=Aan] \setuplettertext[\s!de][\v!to=An] -\setuplettertext[\s!fr][\v!to=À] +\setuplettertext[\s!fr][\v!to=\Agrave] \setuplettertext[\s!it][\v!to=A] \setuplettertext[\s!es][\v!to=A] @@ -619,7 +695,7 @@ \setuplettertext[\s!en][\v!toname=To] \setuplettertext[\s!nl][\v!toname=Aan] \setuplettertext[\s!de][\v!toname=An] -\setuplettertext[\s!fr][\v!toname=À] +\setuplettertext[\s!fr][\v!toname=\Agrave] \setuplettertext[\s!it][\v!toname=A] \setuplettertext[\s!es][\v!toname=A] @@ -655,16 +731,16 @@ \setuplettertext[\s!en][\v!phone=Phone] \setuplettertext[\s!nl][\v!phone=Telefoon] \setuplettertext[\s!de][\v!phone=Telefon] -\setuplettertext[\s!fr][\v!phone=Téléphone] +\setuplettertext[\s!fr][\v!phone=T\eacute l\eacute phone] \setuplettertext[\s!it][\v!phone=Telefono] -\setuplettertext[\s!es][\v!phone=Teléfono] +\setuplettertext[\s!es][\v!phone=Tel\eacute fono] % fax: \setuplettertext[\s!en][\v!fax=Fax] \setuplettertext[\s!nl][\v!fax=Fax] \setuplettertext[\s!de][\v!fax=Fax] -\setuplettertext[\s!fr][\v!fax=Téléfax] % or Fax +\setuplettertext[\s!fr][\v!fax=T\eacute l\eacute fax] % or Fax \setuplettertext[\s!it][\v!fax=Fax] \setuplettertext[\s!es][\v!fax=Fax] @@ -735,7 +811,7 @@ \setuplettertext[\s!en][\v!street=Street] \setuplettertext[\s!nl][\v!street=] -\setuplettertext[\s!de][\v!street=Straße] +\setuplettertext[\s!de][\v!street=Stra\ssharp e] \setuplettertext[\s!fr][\v!street=] \setuplettertext[\s!it][\v!street=] \setuplettertext[\s!es][\v!street=] 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 2e8445b9d5d..770a3636445 100644 --- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi +++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi @@ -1,6 +1,6 @@ %D \module %D [ file=s-cor-01, -%D version=2011.11.08, +%D version=2011.11.24, %D title=\CONTEXT\ User Module, %D subtitle=Letters, %D author=Wolfgang Schuster, @@ -57,13 +57,12 @@ \def\defineletterelement {\doquadrupleargument\correspondence_element_define [\v!letter]} \def\letterelement {\doquadrupleargument\correspondence_element_place [\v!letter]} -\def\namedletterlayerparameter#element#key{\namedcorrespondencelayerparameter{\v!letter:#element}{#key}} -\def\namedletterframeparameter#element#key{\namedcorrespondenceframeparameter{\v!letter:#element}{#key}} +\def\namedletterlayerparameter#element{\namedcorrespondencelayerparameter{\v!letter:#element}} +\def\namedletterframeparameter#element{\namedcorrespondenceframeparameter{\v!letter:#element}} % Layers \defineletterlayer [\v!head] -\defineletterlayer [\v!firsthead] \defineletterlayer [\v!nexthead] \defineletterlayer [\v!lefthead] \defineletterlayer [\v!righthead] @@ -177,11 +176,6 @@ \letterelement[\v!layer][\v!head][\correspondencelayerparameter\c!alternative] \stopsetups -\startsetups[\v!letter:\v!layer:\v!firsthead] -\def\\{\correspondencelayerparameter\c!separator} -\letterelement[\v!layer][\v!firsthead][\correspondencelayerparameter\c!alternative] -\stopsetups - \defineletterelement[\v!layer][\v!nexthead][\v!gbrief] {\maxaligned {\rlap{\correspondenceparameter\c!fromname} @@ -189,6 +183,34 @@ \llap{\correspondenceparameter\c!date}} \hairline} +\defineletterelement[\v!layer][\v!nexthead][\v!fullblock] + {\maxaligned + {\rlap{\correspondenceparameter\c!toname}% + \midaligned{\pagenumber}% + \llap{\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=\v!left] + {\correspondenceparameter\c!date \\ + \correspondenceparameter\c!reference}}}} + +\defineletterelement[\v!layer][\v!nexthead][\v!hanging] + {\maxaligned + {\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=v!right] + {\correspondenceparameter\c!toname \\ + \correspondenceparameter\c!date \\ + \correspondenceparameter\c!reference \\ + \lettertext\c!page\pagenumber}}\hss} + +\defineletterelement[\v!layer][\v!nexthead][\v!semiblock] + {\maxaligned + {\rlap{\correspondenceparameter\c!toname}% + \midaligned{\pagenumber}% + \llap{\correspondenceparameter\c!date}}} + +\defineletterelement[\v!layer][\v!nexthead][\v!simplified] + {\letterelement[\v!layer][\v!nexthead][\v!fullblock]} + +\defineletterelement[\v!layer][\v!nexthead][\v!modified] + {\letterelement[\v!layer][\v!nexthead][\v!hanging]} + \startsetups[\v!letter:\v!layer:\v!nexthead] \def\\{\correspondencelayerparameter\c!separator} \letterelement[\v!layer][\v!nexthead][\correspondencelayerparameter\c!alternative] @@ -220,7 +242,6 @@ \eTR \eTABLE} - \startsetups[\v!letter:\v!layer:\v!foot] \def\\{\correspondencelayerparameter\c!separator} \letterelement[\v!layer][\v!foot][\correspondencelayerparameter\c!alternative] @@ -298,6 +319,83 @@ \letterelement[\v!layer][\v!location][\correspondencelayerparameter\c!alternative] \stopsetups +\startsetups[\v!letter:\v!layer:\v!topmark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!topmark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!botmark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!botmark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!cutmark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!cutmark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!endmark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!endmark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!usermark] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!usermark][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!lettermain] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!lettermain][\correspondencelayerparameter\c!alternative] +\stopsetups + +\startsetups[\v!letter:\v!layer:\v!letternext] +\def\\{\correspondencelayerparameter\c!separator} +\letterelement[\v!layer][\v!letternext][\correspondencelayerparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!head][\v!blockstyle] + {\correspondenceparameter\c!fromaddress} + +\startsetups[\v!letter:\v!section:\v!head] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!head][\correspondencesectionparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!date][\v!blockstyle] + {\correspondenceparameter\c!date} + +\startsetups[\v!letter:\v!section:\v!date] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!date][\correspondencesectionparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!reference][\v!blockstyle] + {\correspondenceparameter\c!reference} + +\startsetups[\v!letter:\v!section:\v!reference] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!reference][\correspondencesectionparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!specialnotation][\v!blockstyle] + {\correspondenceparameter\c!dispatch} + +\startsetups[\v!letter:\v!section:\v!specialnotation] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!specialnotation][\correspondencesectionparameter\c!alternative] +\stopsetups + +\defineletterelement[\v!section][\v!address][\v!blockstyle] + {\correspondenceparameter\c!toname + \doifsomething{\correspondenceparameter\c!toname}\\ + \correspondenceparameter\c!toaddress} + +\startsetups[\v!letter:\v!section:\v!address] +\def\\{\correspondencesectionparameter\c!separator} +\letterelement[\v!section][\v!address][\correspondencesectionparameter\c!alternative] +\stopsetups + \defineletterelement[\v!section][\v!title][\s!default] {\doifsomethingelse{\correspondenceparameter\c!title} {\correspondenceparameter\c!title} @@ -351,6 +449,10 @@ \raggedcenter\doadaptleftskip{.5\textwidth}% \correspondenceparameter\c!signature\endgraf}} +\defineletterelement[\v!section][\v!closing][\v!simplified] + {\doifsomething{\correspondenceparameter\c!signature}{\blank[\correspondencesectionparameter\c!spaceinbetween]}% + \correspondenceparameter\c!signature} + \startsetups[\v!letter:\v!section:\v!closing] \def\\{\correspondencesectionparameter\c!separator} \letterelement[\v!section][\v!closing][\correspondencesectionparameter\c!alternative] @@ -379,13 +481,13 @@ \ifx\currentcorrespondence\v!letter \doif{\correspondenceoptionparameter\c!option}\v!test{\useletterstyle[test]}% \fi -\to \everybeforecorrespondence +\to \t_correspondence_before \appendtoks \ifx\currentcorrespondence\v!letter \doif{\correspondenceoptionparameter\c!marking}\v!no{\setupletterlayer[\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark][\c!state=\v!stop]}% \fi -\to \everybeforecorrespondence +\to \t_correspondence_before \appendtoks \ifx\currentcorrespondence\v!letter @@ -396,7 +498,7 @@ [\v!firstpage] [\c!topspace=\dimexpr\namedletterlayerparameter\v!reference\c!y+\ht\scratchbox+\namedletterlayerparameter\v!reference\c!distance\relax]}}% \fi -\to \everybeforecorrespondence +\to \t_correspondence_before % Labels diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii index ad015525424..4a3fc34299c 100644 --- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii +++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii @@ -1,6 +1,6 @@ %D \module %D [ file=s-cor-02, -%D version=2011.12.08, +%D version=2011.12.24, %D title=\CONTEXT\ User Module, %D subtitle=Memos, %D author=Wolfgang Schuster, 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 3b6f585ff8c..6c97b365e0d 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 @@ -301,13 +301,13 @@ \ifx\currentcorrespondence\v!memo \doif{\correspondenceoptionparameter\c!option}\v!test{\usememostyle[test]}% \fi -\to \everybeforecorrespondence +\to \t_correspondence_before \appendtoks \ifx\currentcorrespondence\v!memo \doif{\correspondenceoptionparameter\c!marking}\v!no{\setupmemolayer[\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark][\c!state=\v!stop]}% \fi -\to \everybeforecorrespondence +\to \t_correspondence_before % Labels @@ -345,7 +345,7 @@ \setupmemotext[\s!en][\v!toname=To: ] \setupmemotext[\s!nl][\v!toname=Aan: ] \setupmemotext[\s!de][\v!toname=An: ] -\setupmemotext[\s!fr][\v!toname=\Agrave\thinspace: ] +\setupmemotext[\s!fr][\v!toname=À\thinspace: ] \setupmemotext[\s!it][\v!toname=A: ] \setupmemotext[\s!es][\v!toname=A: ] diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkii new file mode 100644 index 00000000000..9b1e599d579 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkii @@ -0,0 +1,62 @@ +%D \module +%D [ file=letter-imp-blockstyle, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Blockstyle basics, +%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 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 . + +\useletterstyle[default] + +\setuplettersection + [\v!head,\v!date,\v!reference,\v!specialnotation,\v!address] + [\c!alternative=\v!blockstyle] + +\setupletteroptions + [\c!marking=\v!no] + +\setupletterelements + [\v!layer] + [\v!lettermain, + \v!letternext, + \v!nexthead, + \v!lefthead, + \v!righthead, + \v!foot, + \v!nextfoot, + \v!topmark, + \v!botmark, + \v!cutmark] + +\setupletterelements + [\v!section] + [\v!head, + \v!date, + \v!reference, + \v!specialnotation, + \v!address, + \v!title, + \v!opening, + \v!subject, + \v!content, + \v!closing, + \v!appendices] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkiv new file mode 100644 index 00000000000..9b1e599d579 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkiv @@ -0,0 +1,62 @@ +%D \module +%D [ file=letter-imp-blockstyle, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Blockstyle basics, +%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 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 . + +\useletterstyle[default] + +\setuplettersection + [\v!head,\v!date,\v!reference,\v!specialnotation,\v!address] + [\c!alternative=\v!blockstyle] + +\setupletteroptions + [\c!marking=\v!no] + +\setupletterelements + [\v!layer] + [\v!lettermain, + \v!letternext, + \v!nexthead, + \v!lefthead, + \v!righthead, + \v!foot, + \v!nextfoot, + \v!topmark, + \v!botmark, + \v!cutmark] + +\setupletterelements + [\v!section] + [\v!head, + \v!date, + \v!reference, + \v!specialnotation, + \v!address, + \v!title, + \v!opening, + \v!subject, + \v!content, + \v!closing, + \v!appendices] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii index 162f7a21604..be8e8f09db2 100644 --- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii @@ -67,7 +67,7 @@ \setupletterlayer [\v!backaddress] [\c!alternative=\v!auto, - \c!separator=\textcomma\space] + \c!separator={, }] \setupletterlayer [\v!reference] diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv index 162f7a21604..be8e8f09db2 100644 --- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv @@ -67,7 +67,7 @@ \setupletterlayer [\v!backaddress] [\c!alternative=\v!auto, - \c!separator=\textcomma\space] + \c!separator={, }] \setupletterlayer [\v!reference] diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii new file mode 100644 index 00000000000..39270336a50 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii @@ -0,0 +1,52 @@ +%D \module +%D [ file=letter-imp-fullblock, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Fullblock style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!fit] + +\setupletterlayout + [\v!secondpage] + [\c!header=.5in] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setupletterlayer + [\v!nexthead] + [\c!alternative=\v!fullblock] + +\setupletteroptions + [\c!whitespace=\v!line] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv new file mode 100644 index 00000000000..39270336a50 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv @@ -0,0 +1,52 @@ +%D \module +%D [ file=letter-imp-fullblock, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Fullblock style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!fit] + +\setupletterlayout + [\v!secondpage] + [\c!header=.5in] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setupletterlayer + [\v!nexthead] + [\c!alternative=\v!fullblock] + +\setupletteroptions + [\c!whitespace=\v!line] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii new file mode 100644 index 00000000000..0814f510a5f --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii @@ -0,0 +1,61 @@ +%D \module +%D [ file=letter-imp-hanging, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Hanging indented style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!fit] + +\setupletterlayout + [\v!secondpage] + [\c!header=1in] + +\setuplettersection + [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] + [\c!leftmargin=.5\textwidth] + +\setuplettersection + [\v!content] + [\c!leftmargin=1.5em, + \c!indenting={\v!yes,-1.5em}] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setupletterlayer + [\v!nexthead] + [\c!alternative=\v!hanging] + +\setupletteroptions + [\c!whitespace=\v!line] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv new file mode 100644 index 00000000000..0814f510a5f --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv @@ -0,0 +1,61 @@ +%D \module +%D [ file=letter-imp-hanging, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Hanging indented style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!fit] + +\setupletterlayout + [\v!secondpage] + [\c!header=1in] + +\setuplettersection + [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] + [\c!leftmargin=.5\textwidth] + +\setuplettersection + [\v!content] + [\c!leftmargin=1.5em, + \c!indenting={\v!yes,-1.5em}] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setupletterlayer + [\v!nexthead] + [\c!alternative=\v!hanging] + +\setupletteroptions + [\c!whitespace=\v!line] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii new file mode 100644 index 00000000000..b5c1baa6d46 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii @@ -0,0 +1,56 @@ +%D \module +%D [ file=letter-imp-modified, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Modified block style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!middle] + +\setupletterlayout + [\v!secondpage] + [\c!header=1in] + +\setuplettersection + [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] + [\c!leftmargin=.5\textwidth] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setupletterlayer + [\v!nexthead] + [\c!alternative=\v!hanging] + +\setupletteroptions + [\c!whitespace=\v!line] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv new file mode 100644 index 00000000000..b5c1baa6d46 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv @@ -0,0 +1,56 @@ +%D \module +%D [ file=letter-imp-modified, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Modified block style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!middle] + +\setupletterlayout + [\v!secondpage] + [\c!header=1in] + +\setuplettersection + [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] + [\c!leftmargin=.5\textwidth] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setupletterlayer + [\v!nexthead] + [\c!alternative=\v!hanging] + +\setupletteroptions + [\c!whitespace=\v!line] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii new file mode 100644 index 00000000000..942abc683df --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii @@ -0,0 +1,57 @@ +%D \module +%D [ file=letter-imp-semiblock, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Semiblock style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!middle] + +\setupletterlayout + [\v!secondpage] + [\c!header=.5in] + +\setuplettersection + [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] + [\c!leftmargin=.5\textwidth] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setupletterlayer + [\v!nexthead] + [\c!alternative=\v!semiblock] + +\setupletteroptions + [\c!whitespace=\v!line, + \c!indenting={\v!yes,\v!medium,\v!first}] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv new file mode 100644 index 00000000000..942abc683df --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv @@ -0,0 +1,57 @@ +%D \module +%D [ file=letter-imp-semiblock, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Semiblock style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!middle] + +\setupletterlayout + [\v!secondpage] + [\c!header=.5in] + +\setuplettersection + [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] + [\c!leftmargin=.5\textwidth] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setupletterlayer + [\v!nexthead] + [\c!alternative=\v!semiblock] + +\setupletteroptions + [\c!whitespace=\v!line, + \c!indenting={\v!yes,\v!medium,\v!first}] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii new file mode 100644 index 00000000000..7c23a61f294 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii @@ -0,0 +1,65 @@ +%D \module +%D [ file=letter-imp-simplified, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Simplified style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!middle] + +\setupletterlayout + [\v!secondpage] + [\c!header=.5in] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setuplettersection + [\v!nexthead,\v!closing] + [\c!alternative=\v!simplified] + +\setupletteroptions + [\c!whitespace=\v!line] + +\setupletterelements + [\v!section] + [\v!head + \v!date, + \v!reference, + \v!specialnotation, + \v!address, + \v!title, + \v!subject, + \v!content, + \v!closing, + \v!appendices] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv new file mode 100644 index 00000000000..7c23a61f294 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv @@ -0,0 +1,65 @@ +%D \module +%D [ file=letter-imp-simplified, +%D version=2011.12.24, +%D title=\CONTEXT\ Letter Style, +%D subtitle=Simplified style, +%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 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 . + +\useletterstyle[blockstyle] + +\setupletterlayout + [\v!firstpage,\v!secondpage] + [\c!backspace=1in, + \c!width=\v!middle, + \c!topspace=1in, + \c!header=0in, + \c!footer=0in, + \c!height=\v!middle] + +\setupletterlayout + [\v!secondpage] + [\c!header=.5in] + +\setuplettersection + [\v!closing] + [\c!spaceafter={2*\v!line}] + +\setuplettersection + [\v!nexthead,\v!closing] + [\c!alternative=\v!simplified] + +\setupletteroptions + [\c!whitespace=\v!line] + +\setupletterelements + [\v!section] + [\v!head + \v!date, + \v!reference, + \v!specialnotation, + \v!address, + \v!title, + \v!subject, + \v!content, + \v!closing, + \v!appendices] + +\endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv index 417f9a71290..9dac2c62189 100644 --- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv @@ -47,8 +47,7 @@ [\v!reference] [\c!y=98.5mm] -\setupletterlayer - [\v!foldmark] - [\c!state=\v!stop] +\setupletteroptions + [\c!marking=\v!no] \endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv index f705d7275a2..339613c21cc 100644 --- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv +++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv @@ -51,8 +51,7 @@ [\v!reference] [\c!y=89mm] -\setupletterlayer - [\v!foldmark] - [\c!state=\v!stop] +\setupletteroptions + [\c!marking=\v!no] \endinput diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-test.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-test.mkiv deleted file mode 100644 index 4696fe862cb..00000000000 --- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-test.mkiv +++ /dev/null @@ -1,48 +0,0 @@ -%D \module -%D [ file=letter-imp-test, -%D version=2011.10.29, -%D title=\CONTEXT\ User Module, -%D subtitle=Test style, -%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 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 . - -\defineletterelement[\v!head ][\v!test]{\v!head } -\defineletterelement[\v!nexthead ][\v!test]{\v!nexthead } -\defineletterelement[\v!lefthead ][\v!test]{\v!lefthead } -\defineletterelement[\v!righthead][\v!test]{\v!righthead} - -\setupletterlayer - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!alternative=\v!test] - -\definecolor[\v!letter:\v!head ][r=1.0,g=1.0,b=0.0,t=0.5,a=1] -\definecolor[\v!letter:\v!nexthead ][r=0.0,g=1.0,b=1.0,t=0.5,a=1] -\definecolor[\v!letter:\v!lefthead ][r=1.0,g=0.0,b=1.0,t=0.5,a=1] -\definecolor[\v!letter:\v!righthead][r=0.0,g=1.0,b=0.0,t=0.5,a=1] - -\setupletterframe - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!foregroundstyle=\WORD\tt, - \c!foregroundcolor=\currentcorrespondenceframe, - \c!framecolor=\currentcorrespondenceframe, - \c!offset=1ex, - \c!frame=\v!on] - -\endinput -- cgit v1.2.3