summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-22 23:11:54 +0000
committerKarl Berry <karl@freefriends.org>2009-09-22 23:11:54 +0000
commitbf4ad04d2d2b2a023941978351308eeec0b042c5 (patch)
tree823bac03737b23c9de32af527c727d9116f6094e /Master/texmf-dist/tex/context
parentc1792da9fa440897dcd52010203fd995e6c338cd (diff)
context-letter update (22sep09)
git-svn-id: svn://tug.org/texlive/trunk@15426 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context')
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii9
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv47
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/default.nli13
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/knuth.nli4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri6
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/default.nls7
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/dinb.nls4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/french.nls4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo.nls6
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/pragma.nls4
11 files changed, 68 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
index 25affb32c33..db30c44d134 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-correspondence,
-%D version=2009.07.22,
+%D version=2009.09.21,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -11,6 +11,8 @@
\unprotect
+\startmodule[correspondence]
+
% Placeholders for the messages:
%
% 1: letter|resume / interface|style|extension / filename
@@ -26,6 +28,7 @@
\setinterfacemessage{correspondence}{2} {-- -- -- not found}
\setinterfacemessage{correspondence}{3} {correspage set -- processed (size --)}
\setinterfacemessage{correspondence}{4} {--: --}
+ \setinterfacemessage{correspondence}{5} {your context is too old, you use you need at last version '--'} % not used in mkii
\stopinterface
%D Page numbering
@@ -364,7 +367,7 @@
\getparameters
[#2#3]
[\c!location=\v!left,
- \c!inbetween=\nowhitespace,
+ \c!inbetween={\blank[\v!nowhite]},
\c!before=\blank,
\c!after=\blank,
\c!width=\v!broad,
@@ -436,4 +439,6 @@
{\edef\currentcorrespondenceelement{#2}%
\csname#1:#2:#3\endcsname}
+\stopmodule
+
\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
index 1523840a5a1..be2d187e108 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-correspondence,
-%D version=2009.07.22,
+%D version=2009.09.21,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -11,6 +11,8 @@
\unprotect
+\startmodule[correspondence]
+
% Placeholders for the messages:
%
% 1: letter|resume / interface|style|extension / filename
@@ -26,8 +28,29 @@
\setinterfacemessage{correspondence}{2} {-- -- -- not found}
\setinterfacemessage{correspondence}{3} {correspage set -- processed (size --)}
\setinterfacemessage{correspondence}{4} {--: --}
+ \setinterfacemessage{correspondence}{5} {your context is too old, you use you need at last version '--'}
\stopinterface
+%D Module setup
+
+\setupmodule[\c!contextversion=2009.09.21]
+
+%D Check ConTeXt version
+
+\ifx\forcequitjob\undefined % copied from core-job, needed for older installations
+
+ \def\forcequitjob#1%
+ {\writestatus\m!systems{forcing quit: #1}%
+ \batchmode
+ \dorecurse\textlevel{\stoptext}
+ \normalend}
+
+\fi
+
+\doifolderversionelse\contextversion{\currentmoduleparameter\c!contextversion}
+ {\showmessage\m!correspondence{5}{\currentmoduleparameter\c!contextversion}\forcequitjob\v!correspondence}
+ \donothing
+
%D Page numbering
\def\????cn{@@@@cn}
@@ -387,7 +410,7 @@
\getparameters
[#2#3]
[\c!location=\v!left,
- \c!inbetween=\nowhitespace,
+ \c!inbetween={\blank[\v!nowhite]},
\c!before=\blank,
\c!after=\blank,
\c!width=\v!broad,
@@ -478,7 +501,7 @@ correspondence.files = {
name = "t-correspondence.tex",
path = "tex/context/third/letter/base/",
type = "base",
- version = "2009.07.22",
+ version = "2009.09.21",
description = "Core module"
} ,
{
@@ -500,7 +523,7 @@ correspondence.files = {
name = "default.nli",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2009.07.22",
+ version = "2009.07.23",
description = "Default letter interface"
} ,
@@ -515,7 +538,7 @@ correspondence.files = {
name = "knuth.nli",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2009.01.23",
+ version = "2009.09.21",
description = "letter.tex Interface"
} ,
{
@@ -529,7 +552,7 @@ correspondence.files = {
name = "moderncv.nri",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2009.06.30",
+ version = "2009.09.20",
description = "moderncv resume interface"
} ,
{
@@ -578,14 +601,14 @@ correspondence.files = {
name = "dinb.nls",
path = "tex/context/third/letter/style/",
type = "style",
- version = "2009.02.14",
+ version = "2009.09.20",
description = "German style DIN 676 B"
} ,
{
name = "pragma.nls",
path = "tex/context/third/letter/style/",
type = "style",
- version = "2009.02.12",
+ version = "2009.09.20",
description = "m-letter.tex style"
} ,
{
@@ -606,7 +629,7 @@ correspondence.files = {
name = "french.nls",
path = "tex/context/third/letter/style/",
type = "style",
- version = "2008.08.07",
+ version = "2009.09.20",
description = "French letter style"
} ,
{
@@ -620,7 +643,7 @@ correspondence.files = {
name = "default.nls",
path = "tex/context/third/letter/style/",
type = "style",
- version = "2009.07.16",
+ version = "2009.09.20",
description = "Basic style"
} ,
{
@@ -662,7 +685,7 @@ correspondence.files = {
name = "memo.nls",
path = "tex/context/third/letter/style/",
type = "style",
- version = "2008.11.29",
+ version = "2009.09.21",
description = "Memo style"
} ,
{
@@ -735,4 +758,6 @@ end
\registercorrespondencefile{t-correspondence.tex}
+\stopmodule
+
\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
index 102cfc759a6..c4b70e08bfc 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-correspondence,
-%D version=2009.07.22,
+%D version=2009.09.21,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -94,6 +94,7 @@
\setinterfaceconstant {street} {street}
\setinterfaceconstant {birthday} {birthday}
\setinterfaceconstant {skype} {skype}
+ \setinterfaceconstant {contextversion} {contextversion}
\stopinterface
\startinterface all
@@ -145,7 +146,6 @@
\setinterfacevariable {enclosure} {enclosure}
\setinterfacevariable {copy} {copy}
\setinterfacevariable {nobreak} {nobreak}
- \setinterfacevariable {endgraf} {endgraf}
\setinterfacevariable {memo} {memo}
\setinterfacevariable {addressee} {addressee}
\setinterfacevariable {french} {french}
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/default.nli b/Master/texmf-dist/tex/context/third/letter/interface/default.nli
index 6a61373e5e5..eeaeb3224ae 100644
--- a/Master/texmf-dist/tex/context/third/letter/interface/default.nli
+++ b/Master/texmf-dist/tex/context/third/letter/interface/default.nli
@@ -1,6 +1,6 @@
%D \module
%D [ file=default,
-%D version=2009.07.22,
+%D version=2009.09.20,
%D title=\CONTEXT\ Letter Interface,
%D subtitle=Default Interface,
%D author=Wolfgang Schuster,
@@ -257,11 +257,7 @@
\dodoubleempty\dostartletter}
\def\dostartletter[#1][#2]%
- {\ifcase\letterenvironmentmode\relax
- \@EA\dostartbufferletter
- \else
- \@EA\dostartcontentletter
- \fi[#1][#2]}
+ {\doifelse\@@@@lsoptionmethod\v!buffer\dostartbufferletter\dostartcontentletter[#1][#2]}
\long\def\dostartcontentletter[#1][#2]#3\stopletter
{\ifsecondargument
@@ -702,8 +698,9 @@
%D before and after commands where we control the distance between
%D the elements.
-\defineblankmethod [\v!nobreak] {\penalty\plustenthousand}
-\defineblankmethod [\v!endgraf] {\endgraf }
+\doifmodeelse{mkii}
+ {\defineblankmethod[\v!nobreak]{\penalty\!!tenthousand}}
+ {\definevspacing [\v!nobreak][\v!samepage ]}
%D \subject{Additional settings}
%D
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/knuth.nli b/Master/texmf-dist/tex/context/third/letter/interface/knuth.nli
index f7e58cf8fa7..cdc2b1d0c24 100644
--- a/Master/texmf-dist/tex/context/third/letter/interface/knuth.nli
+++ b/Master/texmf-dist/tex/context/third/letter/interface/knuth.nli
@@ -1,6 +1,6 @@
%D \module
%D [ file=knuth,
-%D version=2009.02.19,
+%D version=2009.09.21,
%D title=\CONTEXT\ Letter Interface,
%D subtitle=Lettformat Interface, % Donald Knuth's own letter format
%D author=Wolfgang Schuster,
@@ -56,7 +56,7 @@
\leftskip\dimexpr\textwidth/13*8\relax
\obeylines
- \def\par{\normalpar\vskip1cm\def\par{\normalpar\nowhitespace}}
+ \def\par{\normalpar\vskip1cm\def\par{\normalpar\blank[\v!nowhite]}}
\getbuffer[closing]\normalpar
\stopsetups
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri b/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
index 668c888c0d7..f58e886cca5 100644
--- a/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
+++ b/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
@@ -1,6 +1,6 @@
%D \module
%D [ file=moderncv,
-%D version=2009.06.30,
+%D version=2009.09.20,
%D title=\CONTEXT\ Resume Interface,
%D subtitle=moderncv Interface,
%D author=Wolfgang Schuster,
@@ -118,13 +118,13 @@
{\dosingleempty\docvlistitem}
\def\docvlistitem[#1]#2% default symbol is \textbullet and not \endash
- {\cvline[none]{}{\doifelsenothing{#1}{--}{#1}~\vtop{\hsize\measure{listitemmaincolumnwidth}#2}}}
+ {\cvline[\v!nowhite]{}{\doifelsenothing{#1}{--}{#1}~\vtop{\hsize\measure{listitemmaincolumnwidth}#2}}}
\def\cvlistdoubleitem
{\dosingleempty\docvlistdoubleitem}
\def\docvlistdoubleitem[#1]#2#3%
- {\cvline[none]{}%
+ {\cvline[\v!nowhite]{}%
{\hbox\bgroup
\doifelsenothing{#1}{--}{#1}~\vtop{\hsize\measure{listdoubleitemmaincolumnwidth}#2}%
\hfill
diff --git a/Master/texmf-dist/tex/context/third/letter/style/default.nls b/Master/texmf-dist/tex/context/third/letter/style/default.nls
index 1e51f661fea..9d724794e74 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/default.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/default.nls
@@ -1,6 +1,6 @@
%D \module
%D [ file=default,
-%D version=2009.07.16,
+%D version=2009.09.20,
%D title=\CONTEXT\ Letter Style,
%D subtitle=Blockstyle initalization,
%D author=Wolfgang Schuster,
@@ -41,7 +41,8 @@
\setupletterstyle
[\v!option]
- [\c!dispatch=\v!yes,
+ [\c!method=\v!buffer,
+ \c!dispatch=\v!yes,
\c!addressee=\v!yes]
\setupletterstyle
@@ -123,6 +124,6 @@
\setupletterstyle
[\v!closing]
[\c!after={\blank[\v!line]},
- \c!inbetween={\blank[\v!endgraf,\v!nobreak,2*\v!line]}]
+ \c!inbetween={\endgraf\blank[\v!nobreak,2*\v!line]}]
\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/dinb.nls b/Master/texmf-dist/tex/context/third/letter/style/dinb.nls
index f2defe37bd8..31706a3b79a 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/dinb.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/dinb.nls
@@ -1,6 +1,6 @@
%D \module
%D [ file=dinb,
-%D version=2009.02.14,
+%D version=2009.09.20,
%D title=\CONTEXT\ Letter Style,
%D subtitle=DIN 676 B,
%D author=Wolfgang Schuster,
@@ -47,7 +47,7 @@
\setupletterstyle
[\v!content]
- [\c!after={\blank[nobreak,line]}]
+ [\c!after={\blank[\v!nobreak,\v!line]}]
\setupletterstyle
[\v!closing]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/french.nls b/Master/texmf-dist/tex/context/third/letter/style/french.nls
index b2cc80c14c3..c38e90dfa9e 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/french.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/french.nls
@@ -1,6 +1,6 @@
%D \module
%D [ file=french,
-%D version=2008.08.07,
+%D version=2009.09.20,
%D title=\CONTEXT\ Letter Style,
%D subtitle=French Style,
%D author=Wolfgang Schuster,
@@ -57,7 +57,7 @@
\setupletterstyle
[\v!closing]
- [\c!inbetween={\blank[\v!endgraf,\v!nobreak,2*\v!line]}]
+ [\c!inbetween={\endgraf\blank[\v!nobreak,2*\v!line]}]
\setupletterstyle
[\v!enclosure]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo.nls b/Master/texmf-dist/tex/context/third/letter/style/memo.nls
index b2a40cba858..ce68d3b56c9 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo.nls
@@ -1,6 +1,6 @@
%D \module
%D [ file=memo,
-%D version=2008.11.29,
+%D version=2009.09.21,
%D title=\CONTEXT\ Letter Style,
%D subtitle=Memo style,
%D author=Wolfgang Schuster,
@@ -22,8 +22,8 @@
[\v!letter\v!head,\v!reference\v!line,
\v!special\v!notation,\v!inside\v!address,
\v!title,\v!subject]
- [\c!before=\nowhitespace,
- \c!after=\nowhitespace]
+ [\c!before={\blank[\v!nowhite]},
+ \c!after={\blank[\v!nowhite]}]
\setupletterstyle
[\v!subject,\v!content,\v!closing]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/pragma.nls b/Master/texmf-dist/tex/context/third/letter/style/pragma.nls
index cef5a160a0f..8409988713c 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/pragma.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/pragma.nls
@@ -1,6 +1,6 @@
%D \module
%D [ file=pragma,
-%D version=2009.02.12,
+%D version=2009.09.20,
%D title=\CONTEXT\ Letter Style,
%D subtitle=Pragma Style,
%D author=Wolfgang Schuster,
@@ -85,7 +85,7 @@
\startsetups[letter:title:before]
\startlinecorrection
- \blank[\dimexpr\letterstylevalue\v!reference\c!voffset+\letterstylevalue\v!reference\c!height-\letterstylevalue{\v!address\v!layer}\c!voffset\relax]
+ \blank[\the\dimexpr\letterstylevalue\v!reference\c!voffset+\letterstylevalue\v!reference\c!height-\letterstylevalue{\v!address\v!layer}\c!voffset\relax]
\stoplinecorrection
\stopsetups