From ce6f802c50e4067703fa76020278ed229fcadd5a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 1 Jul 2009 00:35:03 +0000 Subject: context-letter update (30jun09) git-svn-id: svn://tug.org/texlive/trunk@14036 c570f23f-e606-0410-a88d-b1316a301751 --- .../letter/doc/correspondence-environment.tex | 32 ++++++++++++++-------- .../third/letter/doc/correspondence-revision.tex | 12 ++++---- 2 files changed, 26 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/source/context/third') 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 -- cgit v1.2.3