summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-01 00:35:03 +0000
committerKarl Berry <karl@freefriends.org>2009-07-01 00:35:03 +0000
commitce6f802c50e4067703fa76020278ed229fcadd5a (patch)
tree89ec62950aa58c25d6302ab0a9e777e14a25ecc4
parentae5b1dd5de451a8daa2ff39f7fe386b8a8d84d28 (diff)
context-letter update (30jun09)
git-svn-id: svn://tug.org/texlive/trunk@14036 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/context/third/letter/correspondence.pdfbin450180 -> 443213 bytes
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex32
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex12
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii161
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv8
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex13
-rw-r--r--Master/texmf-dist/tex/context/third/letter/extension/label.nle69
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/default.nri8
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
9 files changed, 107 insertions, 197 deletions
diff --git a/Master/texmf-dist/doc/context/third/letter/correspondence.pdf b/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
index db0e2b1899d..4904e2340fa 100644
--- a/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
+++ b/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
index ff583c3a5bc..2d26ec7d613 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
@@ -12,7 +12,7 @@
\setvariables
[correspondence]
[title=Correspondence with \ConTeXt,
- version=\ctxlua{tex.sprint(tex.ctxcatcodes,thirddata.correspondence.files[1]["version"])}]
+ version=\modulecode{tex.sprint(tex.ctxcatcodes,correspondence.files[1]["version"])}]
%%%% Farbe
@@ -48,6 +48,7 @@
%%%% Zusätzliche Module
+\usemodule[simplefonts]
\usemodule[visual]
\usemodule[letter]
\usemodule[resume]
@@ -64,15 +65,17 @@
%%%% Schriften
+\definefontfeature[default][default][mode=node,expansion=quality,protrusion=quality]
+
\startmode[wolf]
-\definefontfeature[default][default][mode=node,expansion=quality,protrusion=quality]
+\setupsimplefonts[size=11pt]
-\usetypescriptfile[type-delicious]
-\usetypescriptfile[type-lucida]
+\setmainfont[Lucida Bright]
+\setsansfont[Lucida Sans]
+\setmonofont[Lucida Sans Typewriter]
-\usetypescript[lucida,delicious]
-\setupbodyfont[lucida,11pt]
+\definefontfamily[delicious][Delicious]
\stopmode
@@ -80,8 +83,13 @@
\definefontfeature[default][default][mode=node,expansion=quality,protrusion=quality]
-\usetypescript[palatino,modern]
-\setupbodyfont[palatino,12pt]
+\setupsimplefonts[size=12pt]
+
+\setmainfont[TeX Gyre Pagella]
+\setsansfont[Latin Modern Sans]
+\setmonofont[Latin Modern Mono]
+
+\definefontfamily[modern][Latin Modern Sans]
\stopnotmode
@@ -91,8 +99,8 @@
%% Einnstellungen für die Musterbriefe
\doifmodeelse{wolf}
- {\setupletterstyle[option][bodyfont={delicious,ss}]}
- {\setupletterstyle[option][bodyfont={modern,ss}]}
+ {\setupletterstyle[option][bodyfont=delicious]}
+ {\setupletterstyle[option][bodyfont=modern]}
\setupletterstyle
[option]
@@ -115,8 +123,8 @@
[after={\blank[2*line]}]
\doifmodeelse{wolf}
- {\setupresumestyle[option][bodyfont={delicious,ss}]}
- {\setupresumestyle[option][bodyfont={modern,ss}]}
+ {\setupresumestyle[option][bodyfont=delicious]}
+ {\setupresumestyle[option][bodyfont=modern]}
\setupresumestyle
[option]
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex
index 4dbe8bfd540..353f38f207e 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex
@@ -14,18 +14,18 @@ version tag at the bottom of each file in the field date.
\NC \bf File \NC \bf Revision \NC \bf Description \NC\NR
\stoptabulatehead
-\startluacode
+\startmodulecode
tex.sprint(tex.ctxcatcodes,"\\starttabulate[|l|l|l|]")
-for k,v in pairs(thirddata.correspondence.files) do
+for k,v in global.pairs(correspondence.files) do
tex.sprint(tex.ctxcatcodes,"\\NC")
- tex.sprint(tex.ctxcatcodes,thirddata.correspondence.files[k]["name"])
+ tex.sprint(tex.ctxcatcodes,correspondence.files[k]["name"])
tex.sprint(tex.ctxcatcodes,"\\NC")
- tex.sprint(tex.ctxcatcodes,thirddata.correspondence.files[k]["version"])
+ tex.sprint(tex.ctxcatcodes,correspondence.files[k]["version"])
tex.sprint(tex.ctxcatcodes,"\\NC")
- tex.sprint(tex.ctxcatcodes,thirddata.correspondence.files[k]["description"])
+ tex.sprint(tex.ctxcatcodes,correspondence.files[k]["description"])
tex.sprint(tex.ctxcatcodes,"\\NC\\NR")
end
tex.sprint(tex.ctxcatcodes,"\\stoptabulate")
-\stopluacode
+\stopmodulecode
\stopcomponent
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 ab39a3ccdc8..b497a7d2197 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
@@ -11,167 +11,6 @@
\unprotect
-% For MkII users only
-
-\startconstants all
- head: head
- foot: foot
- topmark: topmark
- botmark: botmark
- cutmark: cutmark
- endmark: endmark
- usermark: usermark
- foldmark: foldmark
- extension: extension
- interface: interface
- backgroundimage: backgroundimage
- whitespace: whitespace
- nexthead: nexthead
- lefthead: lefthead
- righthead: righthead
- nextfoot: nextfoot
- leftfoot: leftfoot
- rightfoot: rightfoot
- content: content
- backaddress: backaddress
- optimize: optimize
- opening: opening
- closing: closing
- signature: signature
- dispatch: dispatch
- appendices: appendices
- fromaddress: fromaddress
- frombank: frombank
- frommail: frommail
- fromfax: fromfax
- fromlogo: fromlogo
- fromname: fromname
- fromphone: fromphone
- fromurl: fromurl
- toname: toname
- toaddress: toaddress
- enclosure: enclosure
- copy: copy
- ps: ps
- postscript: postscript
- attention: attention
- distribution: distribution
- salutation: salutation
- addressee: addressee
- prefix: prefix
- suffix: suffix
- initials: initials
- formalname: formalname
- informalname: informalname
- yourref: yourref
- yourmail: yourmail
- myref: myref
- mymail: mymail
- customer: customer
- invoice: invoice
- subject: subject
- cc: cc
- enclosure: enclosure
- encl: encl
- phone: phone
- fax: fax
- email: email
- url: url
- bank: bank
- name: name
- room: room
- yourorder: yourorder
- ourinvoice: ourinvoice
- rulewidth: rulewidth
- fromalign: fromalign
- fromrule: fromrule
-\stopconstants
-
-\startvariables all
- secondpage: secondpage
- foot: foot
- topmark: topmark
- botmark: botmark
- cutmark: cutmark
- endmark: endmark
- option: option
- foldmark: foldmark
- usermark: usermark
- layer: layer
- firsthead: firsthead
- nexthead: nexthead
- lefthead: lefthead
- righthead: righthead
- firstfoot: firstfoot
- nextfoot: nextfoot
- leftfoot: leftfoot
- rightfoot: rightfoot
- layout: layout
- place: place
- initialize: initialize
- finish: finish
- sequence: sequence
- style: style
- extension: extension
- interface: interface
- resume: resume
- letter: letter
- backaddress: backaddress
- reference: reference
- location: location
- address: address
- opening: opening
- closing: closing
- letternext: letternext
- lettermain: lettermain
- special: special
- notation: notation
- inside: inside
- optimize: optimize
- file: file
- e: e
- data: data
- sender: sender
- dispatch: dispatch
- enclosure: enclosure
- copy: copy
- nobreak: nobreak
- endgraf: endgraf
- memo: memo
- addressee: addressee
- french: french
- simplified: simplified
- fullblock: fullblock
- hanging: hanging
- modified: modified
- semiblock: semiblock
- contact: contact
- handle: handle
- casual: casual
- classic: classic
- knuth: knuth
- firstname: firstname
- familyname: familyname
- street: street
- town: town
- mobile: mobile
- phone: phone
- fax: fax
- email: email
- info: info
- correspondence: correspondence
-\stopvariables
-
-\startelements all
- set: set
- value: value
- complex: complex
- simple: simple
- use: use
- define: define
- flush: flush
-\stopelements
-
% Placeholders for the messages:
%
% 1: letter|resume / interface|style|extension / filename
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 84de81e13a8..10ae878ef90 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
@@ -484,7 +484,7 @@
\def\registercorrespondencefile#1%
{\doifundefined{@@@@#1@@@@}
- {\letgvalue{@@@@#1@@@@}\empty
+ {\letgvalueempty{@@@@#1@@@@}%
\modulecode{correspondence.checkfile("#1")}}}
%D Lua table with all macro files and their current version, it is used
@@ -501,7 +501,7 @@ correspondence.files = {
name = "t-correspondence.tex",
path = "tex/context/third/letter/base/",
type = "base",
- version = "2009.05.10",
+ version = "2009.06.29",
description = "Core module"
} ,
{
@@ -545,7 +545,7 @@ correspondence.files = {
name = "default.nri",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2009.03.31",
+ version = "2009.06.28",
description = "Default resume interface"
} ,
{
@@ -559,7 +559,7 @@ correspondence.files = {
name = "label.nle",
path = "tex/context/third/letter/extension/",
type = "extension",
- version = "2009.02.13",
+ version = "2009.06.29",
description = "Text labels"
} ,
{
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 a0454c8b8d7..9d89595ae0f 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
@@ -15,12 +15,6 @@
%D I use a few extra constants and variables in my module.
-\ifx\setinterfaceconstant\undefined % fallback for old context versions
- \let\setinterfaceconstant\gobbletwoarguments
- \let\setinterfacevariable\gobbletwoarguments
- \let\setinterfaceelement \gobbletwoarguments
-\fi
-
\startinterface all
\setinterfaceconstant {head} {head}
\setinterfaceconstant {foot} {foot}
@@ -93,6 +87,13 @@
\setinterfaceconstant {rulewidth} {rulewidth}
\setinterfaceconstant {fromalign} {fromalign}
\setinterfaceconstant {fromrule} {fromrule}
+ \setinterfaceconstant {organization} {organization}
+ \setinterfaceconstant {city} {city}
+ \setinterfaceconstant {zip} {zip}
+ \setinterfaceconstant {country} {country}
+ \setinterfaceconstant {street} {street}
+ \setinterfaceconstant {birthday} {birthday}
+ \setinterfaceconstant {skype} {skype}
\stopinterface
\startinterface all
diff --git a/Master/texmf-dist/tex/context/third/letter/extension/label.nle b/Master/texmf-dist/tex/context/third/letter/extension/label.nle
index 6dbef282e14..95a691c6940 100644
--- a/Master/texmf-dist/tex/context/third/letter/extension/label.nle
+++ b/Master/texmf-dist/tex/context/third/letter/extension/label.nle
@@ -1,6 +1,6 @@
%D \module
%D [ file=label,
-%D version=2009.02.14,
+%D version=2009.06.29,
%D title=\CONTEXT\ Letter Extension,
%D subject=Labels,
%D author=Wolfgang Schuster,
@@ -13,6 +13,8 @@
\unprotect
+%D \subject{Letter}
+
%D Label: name
\setuplabeltext[\s!en][\v!letter:\c!name=Name]
@@ -211,6 +213,71 @@
\setuplabeltext[\s!it][\v!letter:\c!bank=Conto bancario]
\setuplabeltext[\s!es][\v!letter:\c!bank=Cuenta bancaria]
+%D Label: organization
+
+\setuplabeltext[\s!en][\v!letter:\c!organization=Organization]
+\setuplabeltext[\s!nl][\v!letter:\c!organization=]
+\setuplabeltext[\s!de][\v!letter:\c!organization=Organisation]
+\setuplabeltext[\s!fr][\v!letter:\c!organization=]
+\setuplabeltext[\s!it][\v!letter:\c!organization=]
+\setuplabeltext[\s!es][\v!letter:\c!organization=]
+
+%D Label: city
+
+\setuplabeltext[\s!en][\v!letter:\c!city=City]
+\setuplabeltext[\s!nl][\v!letter:\c!city=]
+\setuplabeltext[\s!de][\v!letter:\c!city=Stadt]
+\setuplabeltext[\s!fr][\v!letter:\c!city=]
+\setuplabeltext[\s!it][\v!letter:\c!city=]
+\setuplabeltext[\s!es][\v!letter:\c!city=]
+
+%D Label: zip
+
+\setuplabeltext[\s!en][\v!letter:\c!zip=Zip]
+\setuplabeltext[\s!nl][\v!letter:\c!zip=]
+\setuplabeltext[\s!de][\v!letter:\c!zip=Postleitzahl] % PLZ?
+\setuplabeltext[\s!fr][\v!letter:\c!zip=]
+\setuplabeltext[\s!it][\v!letter:\c!zip=]
+\setuplabeltext[\s!es][\v!letter:\c!zip=]
+
+%D Label: country
+
+\setuplabeltext[\s!en][\v!letter:\c!country=Country]
+\setuplabeltext[\s!nl][\v!letter:\c!country=]
+\setuplabeltext[\s!de][\v!letter:\c!country=Land]
+\setuplabeltext[\s!fr][\v!letter:\c!country=]
+\setuplabeltext[\s!it][\v!letter:\c!country=]
+\setuplabeltext[\s!es][\v!letter:\c!country=]
+
+%D Label: street
+
+\setuplabeltext[\s!en][\v!letter:\c!street=Street]
+\setuplabeltext[\s!nl][\v!letter:\c!street=]
+\setuplabeltext[\s!de][\v!letter:\c!street=Stra\ssharp e]
+\setuplabeltext[\s!fr][\v!letter:\c!street=]
+\setuplabeltext[\s!it][\v!letter:\c!street=]
+\setuplabeltext[\s!es][\v!letter:\c!street=]
+
+%D Label: birthday
+
+\setuplabeltext[\s!en][\v!letter:\c!birthday=Birthday]
+\setuplabeltext[\s!nl][\v!letter:\c!birthday=]
+\setuplabeltext[\s!de][\v!letter:\c!birthday=Geburtstag]
+\setuplabeltext[\s!fr][\v!letter:\c!birthday=]
+\setuplabeltext[\s!it][\v!letter:\c!birthday=]
+\setuplabeltext[\s!es][\v!letter:\c!birthday=]
+
+%D Label: skype % for Henning Hraban Ramm
+
+\setuplabeltext[\s!en][\v!letter:\c!skype=Skype]
+\setuplabeltext[\s!nl][\v!letter:\c!skype=Skype]
+\setuplabeltext[\s!de][\v!letter:\c!skype=Skype]
+\setuplabeltext[\s!fr][\v!letter:\c!skype=Skype]
+\setuplabeltext[\s!it][\v!letter:\c!skype=Skype]
+\setuplabeltext[\s!es][\v!letter:\c!skype=Skype]
+
+%D \subject{Memo}
+
%D Label: date
\setuplabeltext[\s!en][\v!memo:\c!date=Date: ]
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/default.nri b/Master/texmf-dist/tex/context/third/letter/interface/default.nri
index 0778da379c2..2c069b319c1 100644
--- a/Master/texmf-dist/tex/context/third/letter/interface/default.nri
+++ b/Master/texmf-dist/tex/context/third/letter/interface/default.nri
@@ -1,6 +1,6 @@
%D \module
%D [ file=default,
-%D version=2009.03.31,
+%D version=2009.06.28,
%D title=\CONTEXT\ Resume Interface,
%D subtitle=Default Interface,
%D author=Wolfgang Schuster,
@@ -52,12 +52,6 @@
%D \stopcontent
%D \stoptyping
-\long\def\dosetbuffer[#1]#2\endbuffer % added \long
- {\begingroup
- \setcurrentbuffer{#1}%
- \mksetbuffer{#2}%
- \endgroup}
-
\def\startresume
{\bgroup\dosingleempty\dostartresume}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index adab71fac5f..aa76df59e17 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -470,6 +470,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'pst-uml', "&MAKEpst",
'pst-vowel', "&MAKEflatten",
'pst-vue3d', "&MAKEpst",
+ 'pstdoc', "die 'skipping, requires python'",
'pstrees', "die 'skipping, obsolete (for latex 2.09)'",
'pstricks', "&MAKEpstricks",
'pstricks-add',"&MAKEpst",