From 7b1e8f210045f442816f74107cd5b934ed70c69c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 9 Oct 2009 00:44:48 +0000 Subject: context-letter update (8oct09) git-svn-id: svn://tug.org/texlive/trunk@15708 c570f23f-e606-0410-a88d-b1316a301751 --- .../context/third/letter/base/t-correspondence.mkii | 2 +- .../context/third/letter/base/t-correspondence.mkiv | 8 ++++---- .../context/third/letter/base/t-correspondence.tex | 2 +- .../tex/context/third/letter/base/t-letter.tex | 20 ++++++++++---------- .../tex/context/third/letter/style/dinb.nls | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/context') 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 db30c44d134..32aba16753b 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.09.21, +%D version=2009.10.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-correspondence.mkiv b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv index be2d187e108..772c08cba14 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.09.21, +%D version=2009.10.07, %D title=\CONTEXT\ User Module, %D subtitle=Correspondence, %D author=Wolfgang Schuster, @@ -501,14 +501,14 @@ correspondence.files = { name = "t-correspondence.tex", path = "tex/context/third/letter/base/", type = "base", - version = "2009.09.21", + version = "2009.10.07", description = "Core module" } , { name = "t-letter.tex", path = "tex/context/third/letter/base/", type = "base", - version = "2009.06.29", + version = "2009.10.07", description = "Letter Module" } , @@ -601,7 +601,7 @@ correspondence.files = { name = "dinb.nls", path = "tex/context/third/letter/style/", type = "style", - version = "2009.09.20", + version = "2009.10.07", description = "German style DIN 676 B" } , { 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 c4b70e08bfc..ba6e05c10d0 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.09.21, +%D version=2009.10.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 572366c24d3..32ec0f5d52f 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.06.29, +%D version=2009.10.07, %D title=\CONTEXT\ User Module, %D subtitle=Framework for Letters, %D author=Wolfgang Schuster, @@ -570,15 +570,12 @@ \stoplocalsetups - \ifx\@@@@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}} - - \fi + \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}}} \stopsetups @@ -698,6 +695,9 @@ \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/style/dinb.nls b/Master/texmf-dist/tex/context/third/letter/style/dinb.nls index 31706a3b79a..5c41cf55dc8 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.09.20, +%D version=2009.10.07, %D title=\CONTEXT\ Letter Style, %D subtitle=DIN 676 B, %D author=Wolfgang Schuster, @@ -55,7 +55,7 @@ \setupletterstyle [\v!topmark,\v!botmark,\v!cutmark] - [\c!state=\v!repeat, + [\c!state={\v!first,\v!next}, \c!hoffset=5mm, \c!strut=\v!no, \c!symbol={\blackrule[\c!width=\plusfour\c!mm,\c!height=.4\points]}] -- cgit v1.2.3