beta 2012.07.26 19:37

1 files changed, 27 insertions, 15 deletions

diff --git a/tex/context/base/mult-ini.mkiv b/tex/context/base/mult-ini.mkiv
index 29fa8390e..d01000f2a 100644
--- a/tex/context/base/mult-ini.mkiv
+++ b/tex/context/base/mult-ini.mkiv
@@ -364,7 +364,7 @@
    \doifinsetelse{#1}{\currentresponses,all}\mult_messages_start_yes\mult_messages_start_nop{#2}}
 
 \def\mult_messages_start_yes#1#2\stopmessages
-  {\ctxlua{interfaces.setmessages("#1",\!!bs#2\!!es)}%
+  {\ctxcommand{setinterfacemessages("#1",\!!bs#2\!!es)}%
    \egroup}
 
 \def\mult_messages_start_nop#1#2\stopmessages
@@ -374,12 +374,12 @@
 
 \unexpanded\def\setinterfacemessage#1#2#3%
   {\ifcsname\m!prefix!#1\endcsname\else\setgvalue{\m!prefix!#1}{#1}\fi
-   \ctxlua{interfaces.setmessage("#1","#2",\!!bs#3\!!es)}}
+   \ctxcommand{setinterfacemessage("#1","#2",\!!bs#3\!!es)}}
 
-\unexpanded\def\setmessagetext   #1#2{\edef\currentmessagetext{\cldcontext{interfaces.getmessage("#1","#2")}}}
-\unexpanded\def\getmessage       #1#2{\cldcontext{interfaces.getmessage("#1","#2")}}
-\unexpanded\def\doifelsemessage  #1#2{\ctxlua{interfaces.doifelsemessage("#1","#2")}}
-\unexpanded\def\showmessage    #1#2#3{\ctxlua{interfaces.showmessage("#1","#2",\!!bs#3\!!es)}}
+\unexpanded\def\setmessagetext   #1#2{\edef\currentmessagetext{\ctxcommand{getmessage("#1","#2")}}}
+\unexpanded\def\getmessage       #1#2{\ctxcommand{getmessage("#1","#2")}}
+\unexpanded\def\doifelsemessage  #1#2{\ctxcommand{doifelsemessage("#1","#2")}}
+\unexpanded\def\showmessage    #1#2#3{\ctxcommand{showmessage("#1","#2",\!!bs#3\!!es)}}
 \unexpanded\def\writestatus      #1#2{\ctxcommand{writestatus("#1",\!!bs#2\!!es)}}
 
 %D \macros
@@ -726,11 +726,11 @@
 % temporary mkiv hack (we can best just store the whole table in memory)
 
 \unexpanded\def\setinterfaceconstant#1#2%
-  {\ctxlua{interfaces.setconstant("#1","#2")}%
+  {\ctxcommand{setinterfaceconstant("#1","#2")}%
    \expandafter\def\csname\c!prefix!#1\endcsname{#1}}
 
 \unexpanded\def\setinterfacevariable#1#2%
-  {\ctxlua{interfaces.setvariable("#1","#2")}%
+  {\ctxcommand{setinterfacevariable("#1","#2")}%
    \expandafter\def\csname\v!prefix!#1\endcsname{#2}}
 
 %D \macros
@@ -759,7 +759,7 @@
 %D part is needed, we use a \type{-}:
 
 \unexpanded\def\setinterfaceelement#1#2%
-  {\ctxlua{interfaces.setelement("#1","#2")}%
+  {\ctxcommand{setinterfaceelement("#1","#2")}%
    \ifcsname\e!prefix!#1\endcsname
      \doifnotvalue{\e!prefix!#1}{#2}{\setvalue{\e!prefix!#1}{#2}}%
    \else
@@ -779,15 +779,27 @@
 
 %D For at the \LUA\ end (experiment):
 
-\def\do@sicon#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}%
-                  \expandafter\gdef\csname\k!prefix!#2\endcsname{#1}} % backmapping from non english
-\def\do@sivar#1#2{\expandafter\gdef\csname\v!prefix!#1\endcsname{#2}}
-\def\do@siele#1#2{\expandafter\gdef\csname\e!prefix!#1\endcsname{#2}}
-\def\do@sicom#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}}
+% \def\do@sicon#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}%
+%                   \expandafter\gdef\csname\k!prefix!#2\endcsname{#1}} % backmapping from non english
+% \def\do@sivar#1#2{\expandafter\gdef\csname\v!prefix!#1\endcsname{#2}}
+% \def\do@siele#1#2{\expandafter\gdef\csname\e!prefix!#1\endcsname{#2}}
+% \def\do@sicom#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}}
+%
+% \startinterface english
+%
+%     \def\do@sicon#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}}
+%
+% \stopinterface
+
+\def\ui_c#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}%
+                \expandafter\gdef\csname\k!prefix!#2\endcsname{#1}} % backmapping from non english
+\def\ui_v#1#2{\expandafter\gdef\csname\v!prefix!#1\endcsname{#2}}
+\def\ui_e#1#2{\expandafter\gdef\csname\e!prefix!#1\endcsname{#2}}
+\def\ui_m#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}}
 
 \startinterface english
 
-    \def\do@sicon#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}}
+    \def\ui_c#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}}
 
 \stopinterface