1 files changed, 35 insertions, 9 deletions
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 38afd034f..9546026e9 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -74,13 +74,20 @@
 % %def\expunded#1{\normalexpanded\expandafter{#1}}
 % \def\expunded#1{\expandafter\empty#1} % used within an edef anyway
 
-
 %D As we don't have namespace definers yet, we use a special one:
 
-\newcount\c_syst_helpers_n_of_namespaces \c_syst_helpers_n_of_namespaces\pluseight % 1-8 reserved for catcodes
+\ifdefined\c_syst_helpers_n_of_namespaces
+
+    % lets plug in a better error message
+
+\else
+
+    \newcount\c_syst_helpers_n_of_namespaces \c_syst_helpers_n_of_namespaces\pluseight % 1-8 reserved for catcodes
+
+    \def\v_interfaces_prefix_template_system{\number    \c_syst_helpers_n_of_namespaces>>}
+    %def\v_interfaces_prefix_template_system{\characters\c_syst_helpers_n_of_namespaces>>} % no \characters yet
 
-\def\v_interfaces_prefix_template_system{\number    \c_syst_helpers_n_of_namespaces>>}
-%def\v_interfaces_prefix_template_system{\characters\c_syst_helpers_n_of_namespaces>>} % no \characters yet
+\fi
 
 \unexpanded\def\installsystemnamespace#1% maybe move this to syst-ini
   {\ifcsname ??#1\endcsname
@@ -3258,6 +3265,25 @@
 %     [here #oeps: \the\scratchcounter]
 % \stoptexdefinition
 
+% \bgroup \obeylines
+%
+% \global\let\stoptexdefinition\relax
+%
+% \unexpanded\gdef\starttexdefinition%
+%   {\bgroup%
+%    \obeylines%
+%    \syst_helpers_start_tex_definition_one}
+%
+% \gdef\syst_helpers_start_tex_definition_one#1
+%   {\catcode\endoflineasciicode\ignorecatcode%
+%    \syst_helpers_start_tex_definition_two{#1}}
+%
+% \gdef\syst_helpers_start_tex_definition_two#1#2\stoptexdefinition%
+%   {\egroup%
+%    \ctxcommand{thetexdefinition("#1")}{#2}}
+%
+% \egroup
+
 \bgroup \obeylines
 
 \global\let\stoptexdefinition\relax
@@ -3265,15 +3291,15 @@
 \unexpanded\gdef\starttexdefinition%
   {\bgroup%
    \obeylines%
-   \syst_helpers_start_tex_definition_one}
+   \syst_helpers_start_tex_definition}
 
-\gdef\syst_helpers_start_tex_definition_one#1
+\gdef\syst_helpers_start_tex_definition#1
   {\catcode\endoflineasciicode\ignorecatcode%
-   \syst_helpers_start_tex_definition_two{#1}}
+   \ctxcommand{texdefinition_1("#1")}}
 
-\gdef\syst_helpers_start_tex_definition_two#1#2\stoptexdefinition%
+\gdef\dostarttexdefinition#1\stoptexdefinition%
   {\egroup%
-   \ctxcommand{thetexdefinition("#1")}{#2}}
+   \ctxcommand{texdefinition_2()}{#1}}
 
 \egroup