summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii88
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv100
-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.tex146
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-resume.tex97
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/knuth.nli6
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/default.nls12
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/default.nrs6
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/dinb.nls10
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
10 files changed, 144 insertions, 324 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 32aba16753b..0011f58684a 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.10.07,
+%D version=2009.10.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -180,11 +180,13 @@
%D Tests
-\long\def\doifcorrespondencevalue #1#2{\doifsomething {\csname #1#2\endcsname}}
-\long\def\doifelsecorrespondencevalue #1#2{\doifsomethingelse{\csname #1#2\endcsname}}
-\long\def\doifcorrespondencestylevalue #1#2#3{\doifsomething {\csname#1#2#3\endcsname}}
-\long\def\doifelsecorrespondencestylevalue#1#2#3{\doifsomethingelse{\csname#1#2#3\endcsname}}
-\long\def\correspondencestylevalue #1#2#3{\csname#1#2#3\endcsname}
+\def\correspondencevalue #1#2{\csname\ifcsname #1#2\endcsname #1#2\else\s!empty\fi\endcsname}
+\def\correspondencestylevalue#1#2#3{\csname\ifcsname#1#2#3\endcsname#1#2#3\else\s!empty\fi\endcsname}
+
+\long\def\doifcorrespondencevalue #1#2{\doifsomething {\correspondencevalue {#1}{#2}}}
+\long\def\doifelsecorrespondencevalue #1#2{\doifsomethingelse{\correspondencevalue {#1}{#2}}}
+\long\def\doifcorrespondencestylevalue #1#2#3{\doifsomething {\correspondencestylevalue{#1}{#2}{#3}}}
+\long\def\doifelsecorrespondencestylevalue#1#2#3{\doifsomethingelse{\correspondencestylevalue{#1}{#2}{#3}}}
%D External files
@@ -208,9 +210,9 @@
{\def\dodododefinecorrespondencelayer##1{\dododefinecorrespondencelayer[#1][#2][##1]}%
\processaction
[#3]
- [\v!foldmark=>{\processcommacommand[\getvalue{#1!list!marking}]\dodododefinecorrespondencelayer},
- \v!header=>{\processcommacommand[\getvalue{#1!list!header}]\dodododefinecorrespondencelayer},
- \v!footer=>{\processcommacommand[\getvalue{#1!list!footer}]\dodododefinecorrespondencelayer},
+ [\v!foldmark=>{\processcommacommand[\csname#1!list!marking\endcsname]\dodododefinecorrespondencelayer},
+ \v!header=>{\processcommacommand[\csname#1!list!header\endcsname ]\dodododefinecorrespondencelayer},
+ \v!footer=>{\processcommacommand[\csname#1!list!footer\endcsname ]\dodododefinecorrespondencelayer},
\s!unknown=>{\dododefinecorrespondencelayer[#1][#2][#3]}]}
\def\dododefinecorrespondencelayer[#1][#2][#3]%
@@ -225,7 +227,7 @@
\c!height=\paperheight]%
\dodosetupcorrespondencelayer
[#1][#2][#3][\v!option]%
- [\c!state=\v!stop,
+ [\c!state=\v!start,
\c!symbol=,
\c!list=,
\c!alternative=\v!a,
@@ -249,32 +251,6 @@
\c!offset=\zeropoint,
\c!preset=\v!left\v!top]}
-\def\dosetcorrespondencelayer[#1][#2][#3]%
- {\doifelsecorrespondencestylevalue{#2}{#3}\c!symbol
- {\dodosetcorrespondencelayer[#1][#2][#3][\correspondencestylevalue{#2}{#3}\c!symbol]}
- {\dodosetcorrespondencelayer[#1][#2][#3][\directsetup{#1:#3}]}}
-
-\def\dodosetcorrespondencelayer[#1][#2][#3][#4]%
- {\setlayer[#1:#3]
- {\localframed[#2#3\v!frame]
- {\edef\currentcorrespondenceelement{#3}%
- \doadaptleftskip {\correspondencestylevalue{#2}{#3}\c!leftmargin }%
- \doadaptrightskip{\correspondencestylevalue{#2}{#3}\c!rightmargin}%
- \doattributes{#2#3}\c!style\c!color{#4}}}}
-
-\def\dodosetheaderfooterlayer#1{\csname @@headfoot@@#1\endcsname}
-
-\setvalue{@@headfoot@@\v!start }{\!!doneatrue }
-\setvalue{@@headfoot@@\v!stop }{\!!doneafalse }
-\setvalue{@@headfoot@@\v!first }{\!!doneatrue }
-\setvalue{@@headfoot@@\v!next }{\!!donebtrue\!!donectrue}
-\setvalue{@@headfoot@@\v!left }{\!!donebtrue }
-\setvalue{@@headfoot@@\v!right }{\!!donectrue }
-\setvalue{@@headfoot@@\v!leftpage }{\!!donebtrue }
-\setvalue{@@headfoot@@\v!rightpage}{\!!donectrue }
-\setvalue{@@headfoot@@\v!page }{\!!donedtrue }
-\setvalue{@@headfoot@@\v!subpage }{\!!donedfalse }
-
% \def\dosetheaderfooterlayer[#1][#2][#3]%
% {\!!doneafalse % first page
% \!!donebfalse % even numbered pages
@@ -294,22 +270,50 @@
% Alternative version of the macro above for the experimental
% interface because \subpagenumber can't be used in \ifnum.
-\def\dosetheaderfooterlayer[#1][#2][#3]%
+\def\dosetcorrespondencelayer[#1][#2][#3]%
{\!!doneafalse % first page
\!!donebfalse % even numbered pages
\!!donecfalse % odd numbered pages
\!!donedfalse % real pagenumber
- \processcommacommand[\getvalue{#2#3\c!state}]\dodosetheaderfooterlayer
+ \processcommacommand[\csname#2#3\c!state\endcsname]\docorrespondencelayerstate
\doifnotvalue{#2#3\v!layer\c!state}\v!stop{\setuplayer[#1:#3][\c!state=\v!start]}%
\ifnum\if!!doned\pagenumber\else\correspagenumber\fi=\plusone
- \if!!donea\dosetcorrespondencelayer[#1][#2][#3]\fi
+ \if!!donea\dodosetcorrespondencelayer[#1][#2][#3]\fi
\else
\ifodd\if!!doned\pagenumber\else\correspagenumber\fi
- \if!!donec\dosetcorrespondencelayer[#1][#2][#3]\fi
+ \if!!donec\dodosetcorrespondencelayer[#1][#2][#3]\fi
\else
- \if!!doneb\dosetcorrespondencelayer[#1][#2][#3]\fi
+ \if!!doneb\dodosetcorrespondencelayer[#1][#2][#3]\fi
\fi\fi}
+\def\dodosetcorrespondencelayer[#1][#2][#3]%
+ {\doifelsecorrespondencestylevalue{#2}{#3}\c!symbol
+ {\dododosetcorrespondencelayer[#1][#2][#3][\correspondencestylevalue{#2}{#3}\c!symbol]}
+ {\dododosetcorrespondencelayer[#1][#2][#3][\directsetup{#1:#3}]}}
+
+\def\dododosetcorrespondencelayer[#1][#2][#3][#4]%
+ {\setlayer[#1:#3]
+ {\localframed[#2#3\v!frame]
+ {\edef\currentcorrespondenceelement{#3}%
+ \doadaptleftskip {\correspondencestylevalue{#2}{#3}\c!leftmargin }%
+ \doadaptrightskip{\correspondencestylevalue{#2}{#3}\c!rightmargin}%
+ \doattributes{#2#3}\c!style\c!color{#4}}}}
+
+\def\docorrespondencelayerstate#1{\csname @@headfoot@@#1\endcsname}
+
+\setvalue{@@headfoot@@\v!start }{\!!doneatrue }
+\setvalue{@@headfoot@@\v!stop }{\!!doneafalse\!!donebfalse\!!donecfalse}
+\setvalue{@@headfoot@@\v!first }{\!!doneatrue }
+\setvalue{@@headfoot@@\v!next }{\!!donebtrue\!!donectrue }
+\setvalue{@@headfoot@@\v!continue }{\!!donebtrue\!!donectrue }
+\setvalue{@@headfoot@@\v!repeat }{\!!doneatrue\!!donebtrue\!!donectrue }
+\setvalue{@@headfoot@@\v!left }{\!!donebtrue }
+\setvalue{@@headfoot@@\v!right }{\!!donectrue }
+\setvalue{@@headfoot@@\v!leftpage }{\!!donebtrue }
+\setvalue{@@headfoot@@\v!rightpage}{\!!donectrue }
+\setvalue{@@headfoot@@\v!page }{\!!donedtrue }
+\setvalue{@@headfoot@@\v!subpage }{\!!donedfalse }
+
%D Sections
\def\definecorrespondencesection[#1][#2]%
@@ -421,7 +425,7 @@
\def\doflushcorrespondencedescription[#1][#2]%
{\def\dodoflushcorrespondencedescription##1%
{\doif{\correspondencestylevalue{#2}\v!option{##1}}\v!yes{\dosetcorrespondencedescription[#1][#2][##1]}}%
- \processcommacommand[\getvalue{#1!list!descriptions}]\dodoflushcorrespondencedescription}
+ \processcommacommand[\csname#1!list!descriptions\endcsname]\dodoflushcorrespondencedescription}
%D Commands to define named elements for header, footer etc. and use them,
%D clone them or delete their content.
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 772c08cba14..262b24052e6 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.10.07,
+%D version=2009.10.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -200,11 +200,13 @@
%D Tests
-\long\def\doifcorrespondencevalue #1#2{\doifsomething {\csname #1#2\endcsname}}
-\long\def\doifelsecorrespondencevalue #1#2{\doifsomethingelse{\csname #1#2\endcsname}}
-\long\def\doifcorrespondencestylevalue #1#2#3{\doifsomething {\csname#1#2#3\endcsname}}
-\long\def\doifelsecorrespondencestylevalue#1#2#3{\doifsomethingelse{\csname#1#2#3\endcsname}}
-\long\def\correspondencestylevalue #1#2#3{\csname#1#2#3\endcsname}
+\def\correspondencevalue #1#2{\csname\ifcsname #1#2\endcsname #1#2\else\s!empty\fi\endcsname}
+\def\correspondencestylevalue#1#2#3{\csname\ifcsname#1#2#3\endcsname#1#2#3\else\s!empty\fi\endcsname}
+
+\long\def\doifcorrespondencevalue #1#2{\doifsomething {\correspondencevalue {#1}{#2}}}
+\long\def\doifelsecorrespondencevalue #1#2{\doifsomethingelse{\correspondencevalue {#1}{#2}}}
+\long\def\doifcorrespondencestylevalue #1#2#3{\doifsomething {\correspondencestylevalue{#1}{#2}{#3}}}
+\long\def\doifelsecorrespondencestylevalue#1#2#3{\doifsomethingelse{\correspondencestylevalue{#1}{#2}{#3}}}
%D External files
@@ -241,9 +243,9 @@
{\def\dodododefinecorrespondencelayer##1{\dododefinecorrespondencelayer[#1][#2][##1]}%
\processaction
[#3]
- [\v!foldmark=>{\processcommacommand[\getvalue{#1!list!marking}]\dodododefinecorrespondencelayer},
- \v!header=>{\processcommacommand[\getvalue{#1!list!header}]\dodododefinecorrespondencelayer},
- \v!footer=>{\processcommacommand[\getvalue{#1!list!footer}]\dodododefinecorrespondencelayer},
+ [\v!foldmark=>{\processcommacommand[\csname#1!list!marking\endcsname]\dodododefinecorrespondencelayer},
+ \v!header=>{\processcommacommand[\csname#1!list!header\endcsname ]\dodododefinecorrespondencelayer},
+ \v!footer=>{\processcommacommand[\csname#1!list!footer\endcsname ]\dodododefinecorrespondencelayer},
\s!unknown=>{\dododefinecorrespondencelayer[#1][#2][#3]}]}
\def\dododefinecorrespondencelayer[#1][#2][#3]%
@@ -259,7 +261,7 @@
\c!height=\paperheight]%
\dodosetupcorrespondencelayer
[#1][#2][#3][\v!option]%
- [\c!state=\v!stop,
+ [\c!state=\v!start,
\c!symbol=,
\c!list=,
\c!alternative=\v!a,
@@ -283,32 +285,6 @@
\c!offset=\zeropoint,
\c!preset=\v!left\v!top]}
-\def\dosetcorrespondencelayer[#1][#2][#3]%
- {\doifelsecorrespondencestylevalue{#2}{#3}\c!symbol
- {\dodosetcorrespondencelayer[#1][#2][#3][\correspondencestylevalue{#2}{#3}\c!symbol]}
- {\dodosetcorrespondencelayer[#1][#2][#3][\directsetup{#1:#3}]}}
-
-\def\dodosetcorrespondencelayer[#1][#2][#3][#4]%
- {\setlayer[#1:#3]
- {\localframed[#2#3\v!frame]
- {\edef\currentcorrespondenceelement{#3}%
- \doadaptleftskip {\correspondencestylevalue{#2}{#3}\c!leftmargin }%
- \doadaptrightskip{\correspondencestylevalue{#2}{#3}\c!rightmargin}%
- \doattributes{#2#3}\c!style\c!color{#4}}}}
-
-\def\dodosetheaderfooterlayer#1{\csname @@headfoot@@#1\endcsname}
-
-\setvalue{@@headfoot@@\v!start }{\!!doneatrue }
-\setvalue{@@headfoot@@\v!stop }{\!!doneafalse }
-\setvalue{@@headfoot@@\v!first }{\!!doneatrue }
-\setvalue{@@headfoot@@\v!next }{\!!donebtrue\!!donectrue}
-\setvalue{@@headfoot@@\v!left }{\!!donebtrue }
-\setvalue{@@headfoot@@\v!right }{\!!donectrue }
-\setvalue{@@headfoot@@\v!leftpage }{\!!donebtrue }
-\setvalue{@@headfoot@@\v!rightpage}{\!!donectrue }
-\setvalue{@@headfoot@@\v!page }{\!!donedtrue }
-\setvalue{@@headfoot@@\v!subpage }{\!!donedfalse }
-
% \def\dosetheaderfooterlayer[#1][#2][#3]%
% {\!!doneafalse % first page
% \!!donebfalse % even numbered pages
@@ -328,22 +304,50 @@
% Alternative version of the macro above for the experimental
% interface because \subpagenumber can't be used in \ifnum.
-\def\dosetheaderfooterlayer[#1][#2][#3]%
+\def\dosetcorrespondencelayer[#1][#2][#3]%
{\!!doneafalse % first page
\!!donebfalse % even numbered pages
\!!donecfalse % odd numbered pages
\!!donedfalse % real pagenumber
- \processcommacommand[\getvalue{#2#3\c!state}]\dodosetheaderfooterlayer
+ \processcommacommand[\csname#2#3\c!state\endcsname]\docorrespondencelayerstate
\doifnotvalue{#2#3\v!layer\c!state}\v!stop{\setuplayer[#1:#3][\c!state=\v!start]}%
\ifnum\if!!doned\pagenumber\else\correspagenumber\fi=\plusone
- \if!!donea\dosetcorrespondencelayer[#1][#2][#3]\fi
+ \if!!donea\dodosetcorrespondencelayer[#1][#2][#3]\fi
\else
\ifodd\if!!doned\pagenumber\else\correspagenumber\fi
- \if!!donec\dosetcorrespondencelayer[#1][#2][#3]\fi
+ \if!!donec\dodosetcorrespondencelayer[#1][#2][#3]\fi
\else
- \if!!doneb\dosetcorrespondencelayer[#1][#2][#3]\fi
+ \if!!doneb\dodosetcorrespondencelayer[#1][#2][#3]\fi
\fi\fi}
+\def\dodosetcorrespondencelayer[#1][#2][#3]%
+ {\doifelsecorrespondencestylevalue{#2}{#3}\c!symbol
+ {\dododosetcorrespondencelayer[#1][#2][#3][\correspondencestylevalue{#2}{#3}\c!symbol]}
+ {\dododosetcorrespondencelayer[#1][#2][#3][\directsetup{#1:#3}]}}
+
+\def\dododosetcorrespondencelayer[#1][#2][#3][#4]%
+ {\setlayer[#1:#3]
+ {\localframed[#2#3\v!frame]
+ {\edef\currentcorrespondenceelement{#3}%
+ \doadaptleftskip {\correspondencestylevalue{#2}{#3}\c!leftmargin }%
+ \doadaptrightskip{\correspondencestylevalue{#2}{#3}\c!rightmargin}%
+ \doattributes{#2#3}\c!style\c!color{#4}}}}
+
+\def\docorrespondencelayerstate#1{\csname @@headfoot@@#1\endcsname}
+
+\setvalue{@@headfoot@@\v!start }{\!!doneatrue }
+\setvalue{@@headfoot@@\v!stop }{\!!doneafalse\!!donebfalse\!!donecfalse}
+\setvalue{@@headfoot@@\v!first }{\!!doneatrue }
+\setvalue{@@headfoot@@\v!next }{\!!donebtrue\!!donectrue }
+\setvalue{@@headfoot@@\v!continue }{\!!donebtrue\!!donectrue }
+\setvalue{@@headfoot@@\v!repeat }{\!!doneatrue\!!donebtrue\!!donectrue }
+\setvalue{@@headfoot@@\v!left }{\!!donebtrue }
+\setvalue{@@headfoot@@\v!right }{\!!donectrue }
+\setvalue{@@headfoot@@\v!leftpage }{\!!donebtrue }
+\setvalue{@@headfoot@@\v!rightpage}{\!!donectrue }
+\setvalue{@@headfoot@@\v!page }{\!!donedtrue }
+\setvalue{@@headfoot@@\v!subpage }{\!!donedfalse }
+
%D Sections
\def\correspondencesectionkeys
@@ -464,7 +468,7 @@
\def\doflushcorrespondencedescription[#1][#2]%
{\def\dodoflushcorrespondencedescription##1%
{\doif{\correspondencestylevalue{#2}\v!option{##1}}\v!yes{\dosetcorrespondencedescription[#1][#2][##1]}}%
- \processcommacommand[\getvalue{#1!list!descriptions}]\dodoflushcorrespondencedescription}
+ \processcommacommand[\csname#1!list!descriptions\endcsname]\dodoflushcorrespondencedescription}
%D Commands to define named elements for header, footer etc. and use them,
%D clone them or delete their content.
@@ -501,14 +505,14 @@ correspondence.files = {
name = "t-correspondence.tex",
path = "tex/context/third/letter/base/",
type = "base",
- version = "2009.10.07",
+ version = "2009.10.10",
description = "Core module"
} ,
{
name = "t-letter.tex",
path = "tex/context/third/letter/base/",
type = "base",
- version = "2009.10.07",
+ version = "2009.10.10",
description = "Letter Module"
} ,
@@ -516,7 +520,7 @@ correspondence.files = {
name = "t-resume.tex",
path = "tex/context/third/letter/base/",
type = "base",
- version = "2009.02.12",
+ version = "2009.10.10",
description = "Résumé Module"
} ,
{
@@ -538,7 +542,7 @@ correspondence.files = {
name = "knuth.nli",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2009.09.21",
+ version = "2009.10.08",
description = "letter.tex Interface"
} ,
{
@@ -643,7 +647,7 @@ correspondence.files = {
name = "default.nls",
path = "tex/context/third/letter/style/",
type = "style",
- version = "2009.09.20",
+ version = "2009.10.10",
description = "Basic style"
} ,
{
@@ -713,7 +717,7 @@ correspondence.files = {
name = "default.nrs",
path = "tex/context/third/letter/style/",
type = "style",
- version = "2009.02.10",
+ version = "2009.10.10",
description = "Default resume style"
} ,
{
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 ba6e05c10d0..5582ba68173 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.10.07,
+%D version=2009.10.10,
%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 32ec0f5d52f..34cad56378f 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=2009.10.07,
+%D version=2009.10.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Framework for Letters,
%D author=Wolfgang Schuster,
@@ -205,8 +205,7 @@
%D The rest of module contains only internal macros and other settings,
%D you don't need them as a normal user but you look at the default.
-\def\letterstylevalue#1#2%
- {\csname\????ls#1#2\endcsname}
+\def\letterstylevalue{\correspondencestylevalue\????ls}
%D The old definition of \type{\lettervalue} required two arguments.
%D
@@ -218,8 +217,7 @@
%D The new definition needs only one arguments because \type{\setupletter}
%D needs only one argument for the values in the new version.
-\def\lettervalue#1%
- {\csname\????ld#1\endcsname}
+\def\lettervalue{\correspondencevalue\????ld}
\let\letter!list!layers \empty
\let\letter!list!sections \empty
@@ -257,42 +255,10 @@
\startsetups[\v!letter:\v!place:\v!head]
- % First page
-
- \startlocalsetups[\v!letter:\v!place:\v!firsthead]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!head]
-
- \stoplocalsetups
-
- % Following pages
-
- \startlocalsetups[\v!letter:\v!place:\v!nexthead]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!nexthead]
-
- \stoplocalsetups
-
- % Left pages
-
- \startlocalsetups[\v!letter:\v!place:\v!lefthead]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!lefthead]
-
- \stoplocalsetups
-
- % Right pages
-
- \startlocalsetups[\v!letter:\v!place:\v!righthead]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!righthead]
-
- \stoplocalsetups
-
- \doif\@@@@lsoptionhead \v!yes{\directsetup{\v!letter:\v!place:\v!firsthead}}
- \doif\@@@@lsoptionnexthead \v!yes{\directsetup{\v!letter:\v!place:\v!nexthead }}
- \doif\@@@@lsoptionlefthead \v!yes{\directsetup{\v!letter:\v!place:\v!lefthead }}
- \doif\@@@@lsoptionrighthead\v!yes{\directsetup{\v!letter:\v!place:\v!righthead}}
+ \doif\@@@@lsoptionhead \v!yes{\dosetletterlayer[\v!head ]} % First page
+ \doif\@@@@lsoptionnexthead \v!yes{\dosetletterlayer[\v!nexthead ]} % Following pages
+ \doif\@@@@lsoptionlefthead \v!yes{\dosetletterlayer[\v!lefthead ]} % Left pages
+ \doif\@@@@lsoptionrighthead\v!yes{\dosetletterlayer[\v!righthead]} % Right pages
\stopsetups
@@ -345,42 +311,10 @@
\startsetups[\v!letter:\v!place:\v!foot]
- % First page
-
- \startlocalsetups[\v!letter:\v!place:\v!firstfoot]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!foot]
-
- \stoplocalsetups
-
- % Following pages
-
- \startlocalsetups[\v!letter:\v!place:\v!nextfoot]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!nextfoot]
-
- \stoplocalsetups
-
- % Left pages
-
- \startlocalsetups[\v!letter:\v!place:\v!leftfoot]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!leftfoot]
-
- \stoplocalsetups
-
- % Right pages
-
- \startlocalsetups[\v!letter:\v!place:\v!rightfoot]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!rightfoot]
-
- \stoplocalsetups
-
- \doif\@@@@lsoptionfoot \v!yes{\directsetup{\v!letter:\v!place:\v!firstfoot}}
- \doif\@@@@lsoptionnextfoot \v!yes{\directsetup{\v!letter:\v!place:\v!nextfoot }}
- \doif\@@@@lsoptionleftfoot \v!yes{\directsetup{\v!letter:\v!place:\v!leftfoot }}
- \doif\@@@@lsoptionrightfoot\v!yes{\directsetup{\v!letter:\v!place:\v!rightfoot}}
+ \doif\@@@@lsoptionfoot \v!yes{\dosetletterlayer[\v!foot ]} % First page
+ \doif\@@@@lsoptionnextfoot \v!yes{\dosetletterlayer[\v!nextfoot ]} % Following pages
+ \doif\@@@@lsoptionleftfoot \v!yes{\dosetletterlayer[\v!leftfoot ]} % Left pages
+ \doif\@@@@lsoptionrightfoot\v!yes{\dosetletterlayer[\v!rightfoot]} % Right pages
\stopsetups
@@ -530,52 +464,11 @@
\startsetups[\v!letter:\v!place:\v!foldmark]
- % Upper foldmark
-
- \startlocalsetups[\v!letter:\v!place:\v!topmark]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!topmark]
-
- \stoplocalsetups
-
- % Lower foldmark
-
- \startlocalsetups[\v!letter:\v!place:\v!botmark]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!botmark]
-
- \stoplocalsetups
-
- % Cutmark
-
- \startlocalsetups[\v!letter:\v!place:\v!cutmark]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!cutmark]
-
- \stoplocalsetups
-
- % Endmark, a relict from the typewriter area
-
- \startlocalsetups[\v!letter:\v!place:\v!endmark]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!endmark]
-
- \stoplocalsetups
-
- % Free mark, you could use it to place your own symbols
-
- \startlocalsetups[\v!letter:\v!place:\v!usermark]
-
- \dosetheaderfooterlayer[\v!letter][\????ls][\v!usermark]
-
- \stoplocalsetups
-
- \doif\@@@@lsoptionmarking\v!yes
- {\doif\@@@@lsoptiontopmark \v!yes{\directsetup{\v!letter:\v!place:\v!topmark }}
- \doif\@@@@lsoptionbotmark \v!yes{\directsetup{\v!letter:\v!place:\v!botmark }}
- \doif\@@@@lsoptioncutmark \v!yes{\directsetup{\v!letter:\v!place:\v!cutmark }}
- \doif\@@@@lsoptionendmark \v!yes{\directsetup{\v!letter:\v!place:\v!endmark }}
- \doif\@@@@lsoptionusermark\v!yes{\directsetup{\v!letter:\v!place:\v!usermark}}}
+ \doif\@@@@lsoptiontopmark \v!yes{\dosetletterlayer[\v!topmark ]} % Upper foldmark
+ \doif\@@@@lsoptionbotmark \v!yes{\dosetletterlayer[\v!botmark ]} % Lower foldmark
+ \doif\@@@@lsoptioncutmark \v!yes{\dosetletterlayer[\v!cutmark ]} % Cutmark
+ \doif\@@@@lsoptionendmark \v!yes{\dosetletterlayer[\v!endmark ]} % Endmark, a relict from the typewriter area
+ \doif\@@@@lsoptionusermark\v!yes{\dosetletterlayer[\v!usermark]} % Free mark, you could use it to place your own symbols
\stopsetups
@@ -625,7 +518,7 @@
\setupbackgrounds
[\v!page]
- [\c!setups={\v!letter:\v!place:\v!head,\v!letter:\v!place:\v!foot,\v!letter:\v!place:\v!foldmark},
+ [\c!setups={\v!letter:\v!place:\v!head,\v!letter:\v!place:\v!foot,\v!letter:\v!layer},
\c!background=\letter!list!backgrounds]
\doifletterstylevalue\v!option\c!bodyfont {\setupbodyfont [\@@@@lsoptionbodyfont ]}
@@ -656,7 +549,6 @@
\directsetup{\v!letter:\v!initialize} % Settings at the begin
\directsetup{\v!letter:\v!optimize } % Interface dependend
\directsetup{\v!letter:\v!layout } % Page layout
- \directsetup{\v!letter:\v!layer } % Place layers
\directsetup{\v!letter:\v!sequence } % Place content
\directsetup{\v!letter:\v!finish } % Settings at the end
@@ -664,6 +556,7 @@
\startsetups[\v!letter:\v!layer]
+ \doif\@@@@lsoptionmarking \v!yes{\directsetup{\v!letter:\v!place:\v!foldmark }}
\doif\@@@@lsoptionbackaddress\v!yes{\directsetup{\v!letter:\v!place:\v!backaddress}}
\doif\@@@@lsoptionaddress \v!yes{\directsetup{\v!letter:\v!place:\v!address }}
\doif\@@@@lsoptionreference \v!yes{\directsetup{\v!letter:\v!place:\v!reference }}
@@ -695,9 +588,6 @@
\setupletterstyle
[\v!option]
[\c!marking=\v!yes,
- \c!topmark=\v!yes,
- \c!botmark=\v!yes,
- \c!cutmark=\v!yes,
\c!endmark=\v!no,
\c!usermark=\v!no,
\c!backaddress=\v!no,
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex b/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
index 5fb65d427d7..dad4ad6ae0f 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-resume,
-%D version=2009.06.30,
+%D version=2009.10.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Resumes,
%D author=Wolfgang Schuster,
@@ -68,11 +68,8 @@
%D \macros
%D {resumestylevalue,resumevalue}
-\def\resumestylevalue#1#2%
- {\csname\????rs#1#2\endcsname}
-
-\def\resumevalue#1%
- {\csname\????rd#1\endcsname}
+\def\resumestylevalue{\correspondencestylevalue\????rs}
+\def\resumevalue {\correspondencevalue \????rd}
\let\resume!list!layers \empty
\let\resume!list!sections \empty
@@ -109,24 +106,8 @@
\startsetups[\v!resume:\v!place:\v!head]
- % First page
-
- \startlocalsetups[\v!resume:\v!place:\v!firsthead]
-
- \dosetheaderfooterlayer[\v!resume][\????rs][\v!head]
-
- \stoplocalsetups
-
- % Following pages
-
- \startlocalsetups[\v!resume:\v!place:\v!nexthead]
-
- \dosetheaderfooterlayer[\v!resume][\????rs][\v!nexthead]
-
- \stoplocalsetups
-
- \doif\@@@@rsoptionhead \v!yes{\directsetup{\v!resume:\v!place:\v!firsthead}}
- \doif\@@@@rsoptionnexthead\v!yes{\directsetup{\v!resume:\v!place:\v!nexthead }}
+ \doif\@@@@rsoptionhead \v!yes{\dosetresumelayer[\v!head ]} % First page
+ \doif\@@@@rsoptionnexthead\v!yes{\dosetresumelayer[\v!nexthead]} % Following pages
\stopsetups
@@ -136,24 +117,8 @@
\startsetups[\v!resume:\v!place:\v!foot]
- % First page
-
- \startlocalsetups[\v!resume:\v!place:\v!firstfoot]
-
- \dosetheaderfooterlayer[\v!resume][\????rs][\v!foot]
-
- \stoplocalsetups
-
- % Following pages
-
- \startlocalsetups[\v!resume:\v!place:\v!nextfoot]
-
- \dosetheaderfooterlayer[\v!resume][\????rs][\v!nextfoot]
-
- \stoplocalsetups
-
- \doif\@@@@rsoptionfoot \v!yes{\directsetup{\v!resume:\v!place:\v!firstfoot}}
- \doif\@@@@rsoptionnextfoot\v!yes{\directsetup{\v!resume:\v!place:\v!nextfoot }}
+ \doif\@@@@rsoptionfoot \v!yes{\dosetresumelayer[\v!foot ]} % First page
+ \doif\@@@@rsoptionnextfoot\v!yes{\dosetresumelayer[\v!nextfoot]} % Following pages
\stopsetups
@@ -218,46 +183,10 @@
\startsetups[\v!resume:\v!place:\v!foldmark]
- % Upper foldmark
-
- \startlocalsetups[\v!resume:\v!place:\v!topmark]
-
- \dosetheaderfooterlayer[\v!resume][\????rs][\v!topmark]
-
- \stoplocalsetups
-
- % Lower foldmark
-
- \startlocalsetups[\v!resume:\v!place:\v!botmark]
-
- \dosetheaderfooterlayer[\v!resume][\????rs][\v!botmark]
-
- \stoplocalsetups
-
- % Cutmark
-
- \startlocalsetups[\v!resume:\v!place:\v!cutmark]
-
- \dosetheaderfooterlayer[\v!resume][\????rs][\v!cutmark]
-
- \stoplocalsetups
-
- % Free mark, you could use it to place your own symbols
-
- \startlocalsetups[\v!resume:\v!place:\v!usermark]
-
- \dosetheaderfooterlayer[\v!resume][\????rs][\v!usermark]
-
- \stoplocalsetups
-
- \ifx\@@@@rsoptionmarking\v!yes
-
- \doif\@@@@rsoptiontopmark \v!yes{\directsetup{\v!resume:\v!place:\v!topmark }}
- \doif\@@@@rsoptionbotmark \v!yes{\directsetup{\v!resume:\v!place:\v!botmark }}
- \doif\@@@@rsoptioncutmark \v!yes{\directsetup{\v!resume:\v!place:\v!cutmark }}
- \doif\@@@@rsoptionusermark\v!yes{\directsetup{\v!resume:\v!place:\v!usermark}}
-
- \fi
+ \doif\@@@@rsoptiontopmark \v!yes{\dosetresumelayer[\v!topmark ]} % Upper foldmark
+ \doif\@@@@rsoptionbotmark \v!yes{\dosetresumelayer[\v!botmark ]} % Lower foldmark
+ \doif\@@@@rsoptioncutmark \v!yes{\dosetresumelayer[\v!cutmark ]} % Cutmark
+ \doif\@@@@rsoptionusermark\v!yes{\dosetresumelayer[\v!usermark]} % Free mark, you could use it to place your own symbols
\stopsetups
@@ -305,7 +234,7 @@
\setupbackgrounds
[\v!page]
- [\c!setups={\v!resume:\v!place:\v!head,\v!resume:\v!place:\v!foot,\v!resume:\v!place:\v!foldmark},
+ [\c!setups={\v!resume:\v!place:\v!head,\v!resume:\v!place:\v!foot,\v!resume:\v!layer},
\c!background=\resume!list!backgrounds]
\doifresumestylevalue\v!option\c!bodyfont {\setupbodyfont [\@@@@rsoptionbodyfont ]}
@@ -336,7 +265,6 @@
\directsetup{\v!resume:\v!initialize} % Settings at the begin
\directsetup{\v!resume:\v!optimize } % Interface dependend
\directsetup{\v!resume:\v!layout } % Page layout
- \directsetup{\v!resume:\v!layer } % Place layers
\directsetup{\v!resume:\v!sequence } % Place content
\directsetup{\v!resume:\v!finish } % Settings at the end
@@ -344,6 +272,7 @@
\startsetups[\v!resume:\v!layer]
+ \doif\@@@@rsoptionmarking \v!yes{\directsetup{\v!resume:\v!place:\v!foldmark }}
\doif\@@@@rsoptionresumemain\v!yes{\directsetup{\v!resume:\v!place:\v!resumemain}}
\doif\@@@@rsoptionresumenext\v!yes{\directsetup{\v!resume:\v!place:\v!resumenext}}
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 cdc2b1d0c24..cac785ba283 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.09.21,
+%D version=2009.10.08,
%D title=\CONTEXT\ Letter Interface,
%D subtitle=Lettformat Interface, % Donald Knuth's own letter format
%D author=Wolfgang Schuster,
@@ -54,9 +54,9 @@
\startsetups[\v!letter:\v!closing]
- \leftskip\dimexpr\textwidth/13*8\relax
+ \leftskip\dimexpr\textwidth/13*8\relax % relative value to allow papersize changes
\obeylines
- \def\par{\normalpar\vskip1cm\def\par{\normalpar\blank[\v!nowhite]}}
+ \def\par{\normalpar\vskip1cm\def\par{{\normalpar\let\par\normalpar\blank[\v!nowhite]}}} % restore \par for \blank command
\getbuffer[closing]\normalpar
\stopsetups
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 9d724794e74..78c09969e7d 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.09.20,
+%D version=2009.10.10,
%D title=\CONTEXT\ Letter Style,
%D subtitle=Blockstyle initalization,
%D author=Wolfgang Schuster,
@@ -59,10 +59,6 @@
\c!width=\textwidth]
\setupletterstyle
- [\v!head,\v!foot]
- [\c!state=\v!start]
-
-\setupletterstyle
[\v!head]
[\c!rulewidth=\hsize,
\c!fromrule=\v!no,
@@ -82,10 +78,6 @@
[\c!state=\v!right]
\setupletterstyle
- [\v!topmark,\v!botmark,\v!cutmark]
- [\c!state=\v!start]
-
-\setupletterstyle
[\v!reference]
[\v!option]
[\c!list=\lettervalue\c!list,
@@ -95,7 +87,7 @@
\setupletterstyle
[\v!backaddress]
[\v!option]
- [\c!alternative=\v!no,
+ [\c!alternative=\v!auto,
\c!separator=\textcomma\space]
\setupletterstyle
diff --git a/Master/texmf-dist/tex/context/third/letter/style/default.nrs b/Master/texmf-dist/tex/context/third/letter/style/default.nrs
index dbe9fe6e81b..5f325a07e7f 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/default.nrs
+++ b/Master/texmf-dist/tex/context/third/letter/style/default.nrs
@@ -1,6 +1,6 @@
%D \module
%D [ file=default,
-%D version=2009.02.10,
+%D version=2009.10.10,
%D title=\CONTEXT\ Resume Style,
%D subtitle=Default Style,
%D author=Wolfgang Schuster,
@@ -28,10 +28,6 @@
\c!bottomspace=\!!zeropoint]
\setupresumestyle
- [\v!head,\v!foot]
- [\c!state=\v!start]
-
-\setupresumestyle
[\v!nexthead,\v!nextfoot]
[\c!state=\v!next]
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 5c41cf55dc8..9847d1b72e7 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.10.07,
+%D version=2009.10.10,
%D title=\CONTEXT\ Letter Style,
%D subtitle=DIN 676 B,
%D author=Wolfgang Schuster,
@@ -109,6 +109,11 @@
\setupletterstyle
[\v!backaddress]
+ [\v!option]
+ [\c!style=\c!tf\c!xx]
+
+\setupletterstyle
+ [\v!backaddress]
[\v!layer]
[\c!hoffset=\backspace,
\c!voffset=\dimexpr\letterstylevalue{\v!address\v!layer}\c!voffset-\letterstylevalue{\v!backaddress\v!frame}\c!height\relax]
@@ -117,8 +122,7 @@
[\v!backaddress]
[\v!frame]
[\c!height=5mm,
- \c!width=85mm,
- \c!style=\c!tf\c!xx]
+ \c!width=85mm]
\setupletterstyle
[\v!reference]
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 6c7a8024a38..c05997a7e82 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -200,6 +200,7 @@ $Master = "$mydir/../..";
'dtk', "&MAKEflatten",
'dtxtut', "&setup", # straight copy
'easy', "&MAKEeasy",
+ 'easylatex', "die 'skipping, complicated perl modules, sorry'",
'ean13isbn', "&MAKEcopy",
'ebib', "die 'skipping, as it is Emacs'",
'ebong', "&MAKEebong",