summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-09 00:19:40 +0000
committerKarl Berry <karl@freefriends.org>2011-02-09 00:19:40 +0000
commite54e137c03405dbf7da294981ad2a1f8fc6f5dfc (patch)
treeb24b3058351b7951f12f914e8c1dcc4523e1cad6 /Master/texmf-dist/tex
parent077b03cb7e913ab28560eb0152979ff138e16a1e (diff)
context-letter (8feb11)
git-svn-id: svn://tug.org/texlive/trunk@21349 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv10
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex2
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-letter.tex10
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/default.nli21
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri4
6 files changed, 35 insertions, 16 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 680babb2d51..1107416f7d4 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=2010.10.06,
+%D version=2011.02.07,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -484,7 +484,7 @@
\scratchdimen\dimexpr\wd\scratchbox+1em\relax
\fi}
{\doifelse{\correspondencestylevalue{#2}{#3}\c!width}\v!fit
- {\if\wd\scratchbox>\zeropoint
+ {\ifdim\wd\scratchbox>\zeropoint
\scratchdimen\dimexpr\wd\scratchbox+\correspondencestylevalue{#2}{#3}\c!distance\relax
\fi}
{\scratchdimen\dimexpr\correspondencestylevalue{#2}{#3}\c!width+\correspondencestylevalue{#2}{#3}\c!distance\relax}}%
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 53c49bfa090..e4a9375102d 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=2010.10.06,
+%D version=2011.02.07,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -517,7 +517,7 @@
\scratchdimen\dimexpr\wd\scratchbox+1em\relax
\fi}
{\doifelse{\correspondencestylevalue{#2}{#3}\c!width}\v!fit
- {\if\wd\scratchbox>\zeropoint
+ {\ifdim\wd\scratchbox>\zeropoint
\scratchdimen\dimexpr\wd\scratchbox+\correspondencestylevalue{#2}{#3}\c!distance\relax
\fi}
{\scratchdimen\dimexpr\correspondencestylevalue{#2}{#3}\c!width+\correspondencestylevalue{#2}{#3}\c!distance\relax}}%
@@ -597,7 +597,7 @@ correspondence.files = {
name = "t-correspondence.tex",
path = "tex/context/third/letter/base/",
type = "base",
- version = "2010.10.06",
+ version = "2011.02.07",
description = "Core module"
} ,
{
@@ -619,7 +619,7 @@ correspondence.files = {
name = "default.nli",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2010.10.06",
+ version = "2011.02.07",
description = "Default letter interface"
} ,
@@ -648,7 +648,7 @@ correspondence.files = {
name = "moderncv.nri",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2010.08.21",
+ version = "2010.11.22",
description = "moderncv resume interface"
} ,
{
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 98ec8ebd9af..44260edd108 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=2010.10.24,
+%D version=2011.02.07,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex b/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
index cb0353bc2d9..f1348f3e9d7 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-letter,
-%D version=2010.10.06,
+%D version=2011.02.07,
%D title=\CONTEXT\ User Module,
%D subtitle=Framework for Letters,
%D author=Wolfgang Schuster,
@@ -60,10 +60,10 @@
\definecorrespondencesetup[\v!letter\v!style][\v!letter][\????ls]
\def\setupletterlayout [#1]{\setupletterstyle[#1]}
-\def\setupletterlayer [#1]{\setupletterstyle[#1]}
-\def\setupletterframe [#1]{\setupletterstyle[#1]}
-\def\setuplettersection [#1]{\setupletterstyle[#1][\v!layer]}
-\def\setupletterdescription[#1]{\setupletterstyle[#1][\v!frame]}
+\def\setupletterlayer [#1]{\setupletterstyle[#1][\v!layer]}
+\def\setupletterframe [#1]{\setupletterstyle[#1][\v!frame]}
+\def\setuplettersection [#1]{\setupletterstyle[#1]}
+\def\setupletterdescription[#1]{\setupletterstyle[#1]}
\def\setupletteroption [#1]{\setupletterstyle[#1]}
\def\letterstyleparameter {\letterstylevalue }
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 a31861db21b..e85456f27a9 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=2010.10.06,
+%D version=2011.02.07,
%D title=\CONTEXT\ Letter Interface,
%D subtitle=Default Interface,
%D author=Wolfgang Schuster,
@@ -625,10 +625,18 @@
{\doiflettervalue\c!salutation
{\lettervalue\c!salutation}}}
+\startmode[\s!mkii]
\defineletterelement[\v!opening][\v!french]
{\ExpandSecondAfter\doifsomething{\letterstylevalue\v!option\c!indenting}
{\setupindenting[\@@@@lsoptionindenting]}%
\letterelement[\v!opening][\v!a]}
+\stopmode
+
+\startmode[\s!mkiv]
+\defineletterelement[\v!opening][\v!french]
+ {\doifsomething{\letterstylevalue\v!option\c!indenting}{\setupindenting[\@@@@lsoptionindenting]}%
+ \letterelement[\v!opening][\v!a]}
+\stopmode
\startsetups[\v!letter:\v!opening]
\executeifdefined{\v!letter:\v!opening:\@@@@lsopeningalternative}{\getvalue{\v!letter:\v!opening:\v!a}}
@@ -651,6 +659,7 @@
\doiflettervalue\c!signature{\letterstylevalue\v!closing\c!inbetween}%
\lettervalue\c!signature}
+\startmode[\s!mkii]
\defineletterelement[\v!closing][\v!french]
{\ExpandSecondAfter\doifsomething{\letterstylevalue\v!option\c!indenting}
{\setupindenting[\@@@@lsoptionindenting,\v!first]}%
@@ -658,6 +667,16 @@
\doiflettervalue\c!signature{\letterstylevalue\v!closing\c!inbetween}%
\raggedcenter\doadaptleftskip{.5\textwidth}% quick and dirty
\lettervalue\c!signature\endgraf}
+\stopmode
+
+\startmode[\s!mkiv]
+\defineletterelement[\v!closing][\v!french]
+ {\doifsomething{\letterstylevalue\v!option\c!indenting}{\setupindenting[\@@@@lsoptionindenting,\v!first]}%
+ \lettervalue\c!closing
+ \doiflettervalue\c!signature{\letterstylevalue\v!closing\c!inbetween}%
+ \raggedcenter\doadaptleftskip{.5\textwidth}% quick and dirty
+ \lettervalue\c!signature\endgraf}
+\stopmode
\defineletterelement[\v!closing][\v!simplified]
{\doiflettervalue\c!signature{\letterstylevalue\v!closing\c!inbetween}%
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 5d8df614888..2e94b2ebec4 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=2010.08.21,
+%D version=2010.11.22,
%D title=\CONTEXT\ Resume Interface,
%D subtitle=moderncv Interface,
%D author=Wolfgang Schuster,
@@ -104,7 +104,7 @@
\def\docvline[#1]#2#3%
{\bgroup\dontcomplain
\starttable[s0|s0rp(\measure{hintscolumnwidth})|s0w(\measure{separatorcolumnwidth})|s0p(\measure{maincolumnwidth})|]
- \NC\doifelsenothing{#2}{~}{\setupinterlinespace\relax#2}\NC\NC\setupinterlinespace\relax#3\NC\NR
+ \NC\doifelsenothing{#2}{\space}{\setupinterlinespace\relax#2}\NC\NC\setupinterlinespace\relax#3\NC\NR
\stoptable
\egroup
\doifelsenothing{#1}{\blank[.25em]}{\blank[#1]}}