From 78a3e48037a883dd5eec02cfc7d96a543049f666 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 23 Sep 2012 22:58:35 +0000 Subject: context-letter (23sep12) git-svn-id: svn://tug.org/texlive/trunk@27787 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/context/third/letter/base/s-cor-00.mkvi | 4 +- .../tex/context/third/letter/base/s-cor-01.mkvi | 9 +++- .../tex/context/third/letter/base/s-cor-06.mkvi | 55 ++++++++++++++++++++++ 3 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 Master/texmf-dist/tex/context/third/letter/base/s-cor-06.mkvi diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi index a21c1d84b3d..37864fc2d39 100644 --- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi +++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi @@ -1,6 +1,6 @@ %D \module %D [ file=s-cor-00, -%D version=2012.08.26, +%D version=2012.09.21, %D title=\CONTEXT\ User Module, %D subtitle=Correspondence, %D author=Wolfgang Schuster, @@ -80,6 +80,7 @@ \setinterfaceconstant {organization} {organization} \setinterfaceconstant {zip} {zip} \setinterfaceconstant {country} {country} + \setinterfaceconstant {addressentry} {addressentry} \stopinterface \startinterface all @@ -487,7 +488,6 @@ {\scratchdimen} {\unhcopy\scratchbox} {\correspondencedescriptionparameter\c!distance}% - \edef\p_correspondence_description_textcommand{\detokenize\expandafter{\correspondencedescriptionparameter\c!textcommand}}% \ctxlua{thirddata.correspondence.description_split(\!!bs\correspondencedescriptionparameter\c!textcommand\!!es)}% \expandcheckedcsname\????correspondencedescriptionlocation{\correspondencedescriptionparameter\c!location}\v!left \correspondencedescriptionparameter\c!after diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi index f557f385621..77d80ffdcea 100644 --- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi +++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi @@ -1,6 +1,6 @@ %D \module %D [ file=s-cor-01, -%D version=2012.06.10, +%D version=2012.09.21, %D title=\CONTEXT\ User Module, %D subtitle=Letters, %D author=Wolfgang Schuster, @@ -26,6 +26,7 @@ \unprotect \usemodule[cor-00] +\usemodule[cor-06] \startmodule[\v!letter] @@ -547,6 +548,12 @@ \fi \to \t_correspondence_before +\appendtoks % provide this also for the other modules + \ifx\currentcorrespondence\v!letter + \doifsomething{\correspondenceparameter\c!addressentry}{\edef\currentaddressentry{\correspondenceparameter\c!addressentry}}% + \fi +\to \t_correspondence_before + % Labels \definelabelclass [letter] diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-06.mkvi b/Master/texmf-dist/tex/context/third/letter/base/s-cor-06.mkvi new file mode 100644 index 00000000000..7835d34805f --- /dev/null +++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-06.mkvi @@ -0,0 +1,55 @@ +%D \module +%D [ file=s-cor-06, +%D version=2012.09.21, +%D title=\CONTEXT\ User Module, +%D subtitle=Address entries, +%D author=Wolfgang Schuster, +%D date=\currentdate, +%D copyright=Wolfgang Schuster, +%D license=GNU General Public License] + +%C Copyright (C) 2012 Wolfgang Schuster +%C +%C This program is free software: you can redistribute it and/or modify +%C it under the terms of the GNU General Public License as published by +%C the Free Software Foundation, either version 3 of the License, or +%C any later version. +%C +%C This program is distributed in the hope that it will be useful, +%C but WITHOUT ANY WARRANTY; without even the implied warranty of +%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%C GNU General Public License for more details. +%C +%C You should have received a copy of the GNU General Public License +%C along with this program. If not, see . + +\unprotect + +\installnamespace {addressentry} +\installcommandhandler \????addressentry {addressentry} \????addressentry + +\appendtoks + \addressentryparameter\c!reset +\to \everypresetaddressentry + +\appendtoks + \addressentryparameter\c!set +\to \everydefineaddressentry + +\unexpanded\def\addressentry + {\dodoubleempty\addressentry_cmd} + +\def\addressentry_cmd[#id][#key]% + {\begingroup + \ifsecondargument + \edef\currentaddressentry {#id}% + \edef\currentaddressentrykey{#key}% + \else + \edef\currentaddressentrykey{#id}% + \fi + \addressentryparameter\currentaddressentrykey + \endgroup} + +\stopmodule + +\protect \endinput -- cgit v1.2.3