1 files changed, 11 insertions, 9 deletions
diff --git a/tex/context/base/java-ini.mkiv b/tex/context/base/java-ini.mkiv
index e4f0bf28b..d6fe4dd8a 100644
--- a/tex/context/base/java-ini.mkiv
+++ b/tex/context/base/java-ini.mkiv
@@ -105,15 +105,17 @@
 %D This macro can be used to force inclusion of postponed
 %D \JAVASCRIPT\ preambles.
 
+\def\m_java_escape_u{\letterbackslash u}
+
 \unexpanded\def\startJScode
   {\begingroup
    \obeylualines
    \obeyluatokens
-   \def\u{\letterbackslash u}%
+   \let\u\m_java_escape_u
    \java_start_code}
 
 \def\java_start_code#1\stopJScode
-  {\normalexpanded{\endgroup\ctxcommand{storejavascriptcode(\!!bs#1\!!es)}}}
+  {\normalexpanded{\endgroup\clf_storejavascriptcode{#1}}}
 
 \let\stopJScode\relax
 
@@ -121,16 +123,16 @@
   {\begingroup
    \obeylualines
    \obeyluatokens
-   \def\u{\letterbackslash u}%
+   \let\u\m_java_escape_u
    \java_start_preamble}
 
 \def\java_start_preamble#1\stopJSpreamble
-  {\normalexpanded{\endgroup\ctxcommand{storejavascriptpreamble(\!!bs#1\!!es)}}}
+  {\normalexpanded{\endgroup\clf_storejavascriptpreamble{#1}}}
 
 \let\stopJSpreamble\relax
 
-\unexpanded\def\setJSpreamble  #1#2{\ctxcommand{storejavascriptpreamble("#1",\!!bs#2\!!es)}}
-\unexpanded\def\addtoJSpreamble#1#2{\ctxcommand{addtojavascriptpreamble("#1",\!!bs#2\!!es)}}
+\unexpanded\def\setJSpreamble  #1#2{\clf_setjavascriptpreamble  {#1}{#2}}
+\unexpanded\def\addtoJSpreamble#1#2{\clf_addtojavascriptpreamble{#1}{#2}}
 
 %D \macros
 %D   {useJSscripts}
@@ -147,11 +149,11 @@
 %D
 %D The not so complicated implementation of this macro is:
 
-\def\useJSscripts
+\unexpanded\def\useJSscripts
   {\dodoubleempty\java_use_scripts}
 
 \def\java_use_scripts[#1][#2]%
-  {\ctxcommand{usejavascriptscripts(\!!bs#1\!!es)}% two steps as this one calls tex code
-   \ctxcommand{usejavascriptpreamble("#2")}}      % so this one comes later
+  {\clf_usejavascriptscripts {#1}%  two steps as this one calls tex code
+   \clf_usejavascriptpreamble{#2}}% so this one comes later
 
 \protect \endinput