rewrite in mkvi syntax

3 files changed, 22 insertions, 22 deletions

diff --git a/tex/context/interface/third/t-cyrillicnumbers.xml b/tex/context/interface/third/t-cyrillicnumbers.xml
index a5782b2..e3586b2 100644
--- a/tex/context/interface/third/t-cyrillicnumbers.xml
+++ b/tex/context/interface/third/t-cyrillicnumbers.xml
@@ -15,7 +15,7 @@
               language="en"
               version="2013-03-27 23:57:58+0100">
 
-  <cd:command name="setupcyrnum" file="t-cyrillicnumbers.mkiv">
+  <cd:command name="setupcyrnum" file="t-cyrillicnumbers.mkvi">
     <cd:sequence>
       <cd:string value="setupcyrnum"/>
     </cd:sequence>
@@ -63,7 +63,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="definecyrnum" file="t-cyrillicnumbers.mkiv">
+  <cd:command name="definecyrnum" file="t-cyrillicnumbers.mkvi">
       <cd:sequence>
           <cd:string value="definecyrnum"/>
       </cd:sequence>
@@ -77,7 +77,7 @@
       </cd:arguments>
   </cd:command>
 
-  <cd:command name="cyrnum" generated="yes" file="t-cyrillicnumbers.mkiv">
+  <cd:command name="cyrnum" generated="yes" file="t-cyrillicnumbers.mkvi">
     <cd:sequence>
       <cd:variable value="cyrnum"/>
     </cd:sequence>
@@ -89,7 +89,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="cyrnumdrawtitlo" generated="yes" file="t-cyrillicnumbers.mkiv">
+  <cd:command name="cyrnumdrawtitlo" generated="yes" file="t-cyrillicnumbers.mkvi">
     <cd:sequence>
       <cd:variable value="cyrnumdrawtitlo"/>
     </cd:sequence>
diff --git a/tex/context/third/cyrillicnumbers/cyrillicnumbers.lua b/tex/context/third/cyrillicnumbers/cyrillicnumbers.lua
index c28a044..f33395c 100644
--- a/tex/context/third/cyrillicnumbers/cyrillicnumbers.lua
+++ b/tex/context/third/cyrillicnumbers/cyrillicnumbers.lua
@@ -1,12 +1,12 @@
 #!/usr/bin/env texlua
 --------------------------------------------------------------------------------
 --         FILE:  cyrillicnumbers.lua
---        USAGE:  called by t-cyrillicnumbers.mkiv
+--        USAGE:  called by t-cyrillicnumbers.mkvi
 --  DESCRIPTION:  part of the Cyrillic Numbers module for ConTeXt
 -- REQUIREMENTS:  recent ConTeXt MkIV and LuaTeX
---       AUTHOR:  Philipp Gesang (phg), <gesang at stud dot uni-heidelberg dot de>
+--       AUTHOR:  Philipp Gesang (phg), <phg42 dot 2a at gmail dot com>
 --      VERSION:  hg tip
---      CHANGED:  2013-03-27 23:59:10+0100
+--      CHANGED:  2013-03-28 00:10:47+0100
 --------------------------------------------------------------------------------
 --
 
diff --git a/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkvi b/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkvi
index 6c5ae07..d72083b 100644
--- a/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkvi
+++ b/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkvi
@@ -1,6 +1,6 @@
 %D \module
-%D   [     file=t-cyrillicnumbers.mkiv,
-%D      version=2013-03-27 23:57:37+0100,
+%D   [     file=t-cyrillicnumbers.mkvi,
+%D      version=2013-03-28 00:11:33+0100,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Cyrillic Numbers,
 %D       author=Philipp Gesang,
@@ -83,8 +83,8 @@
   \stopluacode%
 }
 
-\appendtoks \setuevalue{\currentcyrnum}{\do_cyrnum[\currentcyrnum]} \to \everydefinecyrnum
-\appendtoks \cyrnumsetvariables                                     \to \everysetupcyrnum
+\appendtoks \setuevalue{\currentcyrnum}{\cyrnum_cmd[\currentcyrnum]} \to \everydefinecyrnum
+\appendtoks \cyrnumsetvariables                                      \to \everysetupcyrnum
 
 %D This allows the module to be loaded with a second set of
 %D key-value arguments. If initialized as follows, additional debug
@@ -377,21 +377,21 @@
 %D   \stoptext
 %D \stoptyping
 
-\unexpanded\def\do_cyrnum[#1]{%
-  \edef\currentcyrnum{#1}%
-  \dosingleempty\dodo_cyrnum%
+\unexpanded\def\cyrnum_cmd[#id]{%
+  \edef\currentcyrnum{#id}%
+  \dosingleempty\cyrnum_cmd_parms%
 }
 
-\def\dodo_cyrnum[#1]{%
+\def\cyrnum_cmd_parms[#parms]{%
   \begingroup
-  \setupcyrnum[\currentcyrnum][#1]%
+  \setupcyrnum[\currentcyrnum][#parms]%
   \cyrnumparameter{command}\begingroup%
-  \dododo_cyrnum%
+  \cyrnum_cmd_content%
 }
 
-\def\dododo_cyrnum#1{%
-  \ctxcommand{cyrillicnumerals(\number#1)}%
-  \endgroup%
+\def\cyrnum_cmd_content#num{%
+  \ctxcommand{cyrillicnumerals(\number#num)}%
+  \endgroup
   \endgroup%
 }
 
@@ -460,10 +460,10 @@
 % Fun %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\peano#1{\ctxcommand{peanonumerals(\number#1)}}
+\def\peano#num{\ctxcommand{peanonumerals(\number#num)}}
 \defineconversion[peano][\peano]
 
-\def\church#1{\ctxcommand{churchnumerals(\number#1)}}
+\def\church#num{\ctxcommand{churchnumerals(\number#num)}}
 \defineconversion[church][\church]
 
 \protect \endinput