context-letter (9jan13)

git-svn-id: svn://tug.org/texlive/trunk@28779 c570f23f-e606-0410-a88d-b1316a301751

48 files changed, 147 insertions, 82 deletions

diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua
index 62ff67ed2e3..9da0a71d03b 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua
@@ -262,7 +262,8 @@ function correspondence.letter.reference_d(environment,list)
                     context.setvalue("currentcorrespondencestyle",style)
                     context.usecorrespondencestylestyleandcolor(c_titlestyle,c_titlecolor)
                     context.lettertext(value)
-                context.EQ()
+                    context.correspondencestyleparameter(c_separator)
+                context.NC()
                     context.setvalue("currentcorrespondencestyle",style)
                     context.usecorrespondencestylestyleandcolor(c_textstyle,c_textcolor)
                     context.correspondenceparameter(value)
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii
index 9a2874c8f81..15645cb73ab 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
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 2f3ff0286e9..e6ce3635ee8 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.12.13,
+%D      version=2013.01.02,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Correspondence,
 %D       author=Wolfgang Schuster,
@@ -13,7 +13,7 @@
 %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 (at your option) 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
@@ -81,6 +81,7 @@
   \setinterfaceconstant {zip}             {zip}
   \setinterfaceconstant {country}         {country}
   \setinterfaceconstant {addressentry}    {addressentry}
+  \setinterfaceconstant {rulewidth}       {rulewidth}
 \stopinterface
 
 \startinterface all
@@ -206,23 +207,27 @@
   \setuevalue{\e!stop \currentcorrespondence}{\correspondence_end[\currentcorrespondence]}%
 \to \everydefinecorrespondence
 
-\unexpanded\def\correspondence_beg_content[#environment]%
+\unexpanded\def\correspondence_content_beg[#environment]%
   {\begingroup
-   \def\currentcorrespondence{#environment}%
+   \edef\currentcorrespondence{#environment}%
    \grabbufferdatadirect{\????correspondencebuffer\currentcorrespondence}{\e!start\currentcorrespondence\v!content}{\e!stop\currentcorrespondence\v!content}}
 
-\unexpanded\def\correspondence_end_content[#environment]%
+\unexpanded\def\correspondence_content_end[#environment]%
   {\endgroup}
 
+\unexpanded\def\correspondence_content_get[#environment]%
+  {\edef\currentcorrespondence{#environment}%
+   \getbufferdata[\????correspondencebuffer\currentcorrespondence]}
+
 \appendtoks
-  \setuevalue{\e!start\currentcorrespondence\v!content}{\correspondence_beg_content[\currentcorrespondence]}%
-  \setuevalue{\e!stop \currentcorrespondence\v!content}{\correspondence_end_content[\currentcorrespondence]}%
+  \setuevalue{\e!start\currentcorrespondence\v!content}{\correspondence_content_beg[\currentcorrespondence]}%
+  \setuevalue{\e!stop \currentcorrespondence\v!content}{\correspondence_content_end[\currentcorrespondence]}%
+  \setuevalue{\e!get  \currentcorrespondence\v!content}{\correspondence_content_get[\currentcorrespondence]}%
 \to \everydefinecorrespondence
 
-\unexpanded\def\correspondence_parameters#environment#element#type%
+\unexpanded\def\correspondence_parameters#environment#element%
   {\edef\currentcorrespondenceenvironment{#environment}%
    \edef\currentcorrespondenceelement    {#element}%
-   \edef\currentcorrespondencecontent    {#environment:#type:#element}%
    \edef\currentcorrespondencelayer      {#environment:#element}%
    \edef\currentcorrespondenceframe      {#environment:#element}%
    \edef\currentcorrespondencesection    {#environment:#element}%
@@ -243,6 +248,7 @@
 % Placement
 
 \newtoks\t_correspondence_before
+\newtoks\t_correspondence_between
 \newtoks\t_correspondence_after
 
 % \unexpanded\def\correspondence_place[#environment]%
@@ -276,6 +282,7 @@
    \ifx\p_correspondence_whitespace     \empty \else \setupwhitespace    [\p_correspondence_whitespace    ]\fi
    \ifx\p_correspondence_interlinespace \empty \else \setupinterlinespace[\p_correspondence_interlinespace]\fi
    \ifx\p_correspondence_language       \empty \else \mainlanguage       [\p_correspondence_language      ]\fi
+   \the\t_correspondence_between
    \ifx\p_correspondence_backgroundcolor\empty \else
      \setupbackgrounds[\v!paper][\c!background=\v!color,\c!backgroundcolor=\p_correspondence_backgroundcolor]%
    \fi
@@ -348,7 +355,7 @@
 
 \unexpanded\def\correspondence_layer_place#environment%
   {\def\correspondence_layer_state#element%
-     {\correspondence_parameters{#environment}{#element}\v!layer
+     {\correspondence_parameters{#environment}{#element}%
       \expandcheckedcsname\????correspondencelayerstate{\correspondencelayerparameter\c!state}\v!stop
       \ifnum\c_correspondence_page=\plusone
         \if!!donea\correspondence_layer_direct\fi
@@ -440,7 +447,7 @@
 
 \unexpanded\def\correspondence_section_place#environment#element%
   {\begingroup
-   \correspondence_parameters{#environment}{#element}\v!section
+   \correspondence_parameters{#environment}{#element}%
    \ifcsname\currentcorrespondencesectionhash\s!parent\endcsname
      \doifsomethingelse{\correspondencesectionparameter\c!spacebefore}{\blank[\correspondencesectionparameter\c!spacebefore]}\endgraf
      \correspondencesectionparameter\c!before
@@ -529,7 +536,7 @@
 
 \unexpanded\def\correspondence_description_place#environment#element%
   {\begingroup
-   \edef\currentcorrespondencedescription{#environment:#element}%
+   \correspondence_parameters{#environment}{#element}%
    \ifcsname\currentcorrespondencedescriptionhash\s!parent\endcsname
      \doifsomethingelse{\correspondencedescriptionparameter\c!textcommand}\donetrue\donefalse
      \ifdone
@@ -653,7 +660,7 @@
 
 \unexpanded\def\correspondence_paragraph_beg[#environment][#element]%
   {\begingroup
-   \correspondence_parameters{#environment}{#element}\v!paragraph
+   \correspondence_parameters{#environment}{#element}%
    \dodoubleempty\correspondence_paragraph_beg_parameters}%
 
 \unexpanded\def\correspondence_paragraph_beg_parameters[#parameters][#dummy]% #dummy removes the linebreak before the first line
@@ -829,7 +836,7 @@
 
 \unexpanded\def\correspondence_head_cmd[#environment][#element]%
   {\begingroup
-   \correspondence_parameters{#environment}{#element}\v!head
+   \correspondence_parameters{#environment}{#element}%
    \doifnextbgroupelse{\dosinglegroupempty\correspondence_head_cmd_argument}{\dosingleempty\correspondence_head_cmd_parameters}}
 
 \unexpanded\def\correspondence_head_cmd_argument#title%
@@ -846,7 +853,7 @@
 
 \unexpanded\def\correspondence_head_beg[#environment][#element]%
   {\begingroup
-   \def\currentcorrespondencehead{#environment:#element}%
+   \correspondence_parameters{#environment}{#element}%
    \dosingleempty\correspondence_head_beg_parameters}
 
 \unexpanded\def\correspondence_head_beg_parameters[#parameters]%
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii
index 735639275c8..8acab8898de 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=s-cor-01,
-%D      version=2012.12.07,
+%D      version=2013.01.02,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Letters,
 %D       author=Wolfgang Schuster,
@@ -13,7 +13,7 @@
 %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 (at your option) 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
@@ -385,8 +385,9 @@
              \noexpand\NC
                \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}{\c!titlestyle}{\c!titlecolor}%
                \lettertext\currentcorrespondencevalue
+               \correspondencestyleparameter\c!separator
                \dostopattributes
-             \noexpand\EQ
+             \noexpand\NC
                \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}{\c!textstyle }{\c!textcolor }%
                \correspondenceparameter\currentcorrespondencevalue
                \dostopattributes
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 45a58e5083a..030f373386c 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.12.09,
+%D      version=2013.01.07,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Letters,
 %D       author=Wolfgang Schuster,
@@ -13,7 +13,7 @@
 %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 (at your option) 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
@@ -129,9 +129,19 @@
 % layer: head
 
 \defineletterlayeralternative[\v!head:\s!default][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\s!default]
-\defineletterlayeralternative[\v!head:\v!left   ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\v!generic,\c!align=\v!flushleft ]
-\defineletterlayeralternative[\v!head:\v!middle ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\v!generic,\c!align=\v!middle    ]
-\defineletterlayeralternative[\v!head:\v!right  ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\v!generic,\c!align=\v!flushright]
+
+\defineletterlayeralternative
+  [\v!head:\v!generic]
+  [\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\v!generic,
+   \c!rule=\correspondencelayerparameter\c!rule,
+   \c!rulewidth=\correspondencelayerparameter\c!rulewidth,
+   \c!rulecolor=\correspondencelayerparameter\c!rulecolor,
+   \c!rulethickness=\correspondencelayerparameter\c!rulethickness]
+
+\defineletterlayeralternative[\v!head:\v!left   ][\v!head:\v!generic][\c!align=\v!flushleft ]
+\defineletterlayeralternative[\v!head:\v!middle ][\v!head:\v!generic][\c!align=\v!middle    ]
+\defineletterlayeralternative[\v!head:\v!right  ][\v!head:\v!generic][\c!align=\v!flushright]
+
 \defineletterlayeralternative[\v!head:\v!gbrief ][\c!renderingsetup=\????correspondencelayerrenderings:\v!letter:\v!head:\v!gbrief ]
 
 \startsetups[\????correspondencelayerrenderings:\v!letter:\v!head:\s!default]
@@ -142,13 +152,26 @@
 \stopsetups
 
 \startsetups[\????correspondencelayerrenderings:\v!letter:\v!head:\v!generic]
+  \edef\p_rulewidth    {\correspondencelayeralternativeparameter\c!rulewidth    }
+  \edef\p_rulethickness{\correspondencelayeralternativeparameter\c!rulethickness}
+  \edef\p_rulecolor    {\correspondencelayeralternativeparameter\c!rulecolor    }
   \startframed[\c!frame=\v!off,\c!align=\correspondencelayeralternativeparameter\c!align,\c!width=\v!broad,\c!offset=\zeropoint]
     \begingroup
       \def\currentcorrespondencestyle{\v!letter:\c!fromname}%
       \usecorrespondencestylestyleandcolor\c!style\c!color
       \correspondenceparameter\c!fromname
     \endgroup
-    \\
+    \endgraf
+    \doifcommonelse{\correspondencelayeralternativeparameter\c!rule}{\v!top,\c!before,\v!yes}\donetrue\donefalse
+    \ifdone
+      \vskip-.5\lineheight
+      \dontleavehmode
+      \blackrule
+        [ \c!width=\ifx\p_rulewidth    \empty\hsize    \else\p_rulewidth    \fi,
+         \c!height=\ifx\p_rulethickness\empty\linewidth\else\p_rulethickness\fi,
+          \c!color=\ifx\p_rulecolor    \empty\s!black  \else\p_rulecolor    \fi]
+    \fi
+    \endgraf
     \begingroup
       \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}%
       \usecorrespondencestylestyleandcolor\c!style\c!color
@@ -158,9 +181,23 @@
       \doifsomething{\correspondenceparameter\c!frommail }{\\\correspondenceparameter\c!frommail }%
       \doifsomething{\correspondenceparameter\c!fromurl  }{\\\correspondenceparameter\c!fromurl  }%
     \endgroup
+    \endgraf
+    \doifcommonelse{\correspondencelayeralternativeparameter\c!rule}{\v!bottom,\c!after,\v!yes}\donetrue\donefalse
+    \ifdone
+      \vskip-.5\lineheight
+      \dontleavehmode
+      \blackrule
+        [ \c!width=\ifx\p_rulewidth    \empty\hsize    \else\p_rulewidth    \fi,
+         \c!height=\ifx\p_rulethickness\empty\linewidth\else\p_rulethickness\fi,
+          \c!color=\ifx\p_rulecolor    \empty\s!black  \else\p_rulecolor    \fi]
+    \fi
   \stopframed
 \stopsetups
 
+\setupcorrespondencelayeralternative
+  [\c!commandbefore=\correspondencelayerparameter\c!commandbefore,
+    \c!commandafter=\correspondencelayerparameter\c!commandafter]
+
 \startsetups[\????correspondencelayerrenderings:\v!letter:\v!head:\v!gbrief]
   \def\\{\correspondencelayerparameter\c!separator}%
   \correspondenceparameter\c!fromname
@@ -523,39 +560,58 @@
 
 \appendtoks
   \ifx\currentcorrespondence\v!letter
-    \processallactionsinset
-      [\correspondenceoptionparameter\c!option]
-      [  \v!test=>{\useletterstyle[test]},
-       \v!setups=>{\useletterstyle[setups]}]%
+    \edef\p_correspondence_option_option{\correspondenceoptionparameter\c!option}%
+    \ifx\p_correspondence_option_option\empty \else
+      \processallactionsinset
+        [\correspondenceoptionparameter\c!option]
+        [  \v!test=>{\useletterstyle[test]},
+         \v!setups=>{\useletterstyle[setups]}]%
+    \fi
   \fi
 \to \t_correspondence_before
 
 \appendtoks
   \ifx\currentcorrespondence\v!letter
-    \doif{\correspondenceoptionparameter\c!marking}\v!no{\setupletterlayer[\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark][\c!state=\v!stop]}%
+    \edef\p_correspondence_option_marking{\correspondenceoptionparameter\c!marking}%
+    \ifx\p_correspondence_option_marking\v!yes
+      \setupletterlayer[\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark][\c!state=\v!start]%
+    \else\ifx\p_correspondence_option_marking\v!no
+      \setupletterlayer[\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark][\c!state=\v!stop ]%
+    \fi\fi
   \fi
 \to \t_correspondence_before
 
 \appendtoks
   \ifx\currentcorrespondence\v!letter
-    \doif{\correspondenceoptionparameter\c!position}\v!yes
-      {\setbox\scratchbox\vbox{\letterelement[\v!layer][\v!reference][\correspondencelayerparameter\c!alternative]}%
-       \normalexpanded
-         {\setupletterlayout
-            [\v!firstpage]
-            [\c!topspace=\dimexpr\namedletterlayerparameter\v!reference\c!y+\ht\scratchbox+\namedletterlayerparameter\v!reference\c!distance\relax]}}%
+    \edef\p_correspondence_option_position{\correspondenceoptionparameter\c!position}%
+    \ifx\p_correspondence_option_position\v!yes % low level code, I need a better solution for this!
+      \setbox\scratchbox\vbox
+        {\edef\currentcorrespondencelayer      {\v!letter:\v!reference}%
+         \edef\currentcorrespondenceenvironment{\v!letter}%
+         \correspondence_layer_alternative_place}%
+      \normalexpanded
+        {\setupletterlayout
+           [\v!firstpage]
+           [\c!topspace=\dimexpr\namedletterlayerparameter\v!reference\c!y+\ht\scratchbox+\namedletterlayerparameter\v!reference\c!distance\relax]}%
+    \fi
   \fi
 \to \t_correspondence_before
 
 \appendtoks
   \ifx\currentcorrespondence\v!letter
-    \doifsomething{\correspondenceoptionparameter\c!indenting}{\setuplettersection[\v!content][\c!indenting=\correspondenceoptionparameter\c!indenting]}%
+    \edef\p_correspondence_option_indenting{\correspondenceoptionparameter\c!indenting}%
+    \ifx\p_correspondence_option_indenting\empty \else
+      \setuplettersection[\v!content][\c!indenting=\p_correspondence_option_indenting]%
+    \fi
   \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}}%
+    \edef\p_correspondence_addressentry{\correspondenceparameter\c!addressentry}%
+    \ifx\p_correspondence_addressentry\empty \else
+      \let\currentaddressentry\p_correspondence_addressentry
+    \fi
   \fi
 \to \t_correspondence_before
 
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii
index 46bc86f9e05..69206f144a9 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi
index c62ad26a396..dadfe033c57 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi
@@ -13,7 +13,7 @@
 %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 (at your option) 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
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
index 7835d34805f..6d541bbbaac 100644
--- 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
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-letter.mkii b/Master/texmf-dist/tex/context/third/letter/base/t-letter.mkii
index 9c9b937a1c1..625f7ecab58 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-letter.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-letter.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-letter.mkiv b/Master/texmf-dist/tex/context/third/letter/base/t-letter.mkiv
index f4ad539f72d..7baa52c34af 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-letter.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-letter.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-memo.mkii b/Master/texmf-dist/tex/context/third/letter/base/t-memo.mkii
index 92a13d4fe71..541ffa0830e 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-memo.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-memo.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-memo.mkiv b/Master/texmf-dist/tex/context/third/letter/base/t-memo.mkiv
index 92c3cb45bee..e859aee4775 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-memo.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-memo.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkii
index d12264d544f..e21193474ba 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkiv
index d12264d544f..e21193474ba 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkii
index fbc29a91e3c..e3636942209 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkiv
index fbc29a91e3c..e3636942209 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkii
index c9987383d5b..7febd6229b8 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkiv
index c9987383d5b..7febd6229b8 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkii
index 85731b9cf71..272d97df2cf 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkiv
index 85731b9cf71..272d97df2cf 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii
index 39270336a50..a8f29214a82 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv
index 39270336a50..a8f29214a82 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkii
index 856295a7785..c655a2a6a53 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkiv
index 856295a7785..c655a2a6a53 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii
index 0814f510a5f..1b4dd7d4369 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv
index 0814f510a5f..1b4dd7d4369 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii
index c8342ae332e..eb1ae07e1f5 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv
index c8342ae332e..eb1ae07e1f5 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii
index b5c1baa6d46..95323e8f428 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv
index b5c1baa6d46..95323e8f428 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii
index 942abc683df..8dc6c86a959 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv
index 942abc683df..8dc6c86a959 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkii
index 116e584a50a..bddf849f030 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkiv
index 116e584a50a..bddf849f030 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii
index 7c23a61f294..769b6055a4d 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv
index 7c23a61f294..769b6055a4d 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkii
index 417f9a71290..5544b000b13 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv
index 9dac2c62189..92f569d4714 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkii
index f705d7275a2..19a2cb843cf 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv
index 339613c21cc..9f0b4e61a1b 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii
index 6b36f72e487..6af68249050 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv
index 6b36f72e487..6af68249050 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii
index b8eb9873036..3783157b2fa 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv
index b8eb9873036..3783157b2fa 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii
index 133d581c47b..077a6c02dca 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv
index 133d581c47b..077a6c02dca 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii
index 979d1810742..2a21da60026 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii
@@ -13,7 +13,7 @@
 %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 (at your option) 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
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv
index 979d1810742..2a21da60026 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv
@@ -13,7 +13,7 @@
 %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 (at your option) 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