3 files changed, 17 insertions, 15 deletions
diff --git a/mod/tex/context/third/rst/rst_helpers.lua b/mod/tex/context/third/rst/rst_helpers.lua
index e6a886b..eefc056 100644
--- a/mod/tex/context/third/rst/rst_helpers.lua
+++ b/mod/tex/context/third/rst/rst_helpers.lua
@@ -16,11 +16,12 @@ local C, Carg, Cb, Cc, Cg, Cmt, Cp, Cs, Ct
     = lpeg.C, lpeg.Carg, lpeg.Cb, lpeg.Cc, lpeg.Cg, lpeg.Cmt, lpeg.Cp, lpeg.Cs, lpeg.Ct
 
 local helpers
-if not context then
-    helpers       = helpers or {}
-else
-    helpers       = thirddata.rst_helpers
-end
+--if not context then
+    --helpers       = helpers or {}
+--else
+    --helpers       = thirddata.rst_helpers
+--end
+helpers       = thirddata.rst_helpers
 helpers.table = {}
 helpers.cell  = {}
 
@@ -630,5 +631,5 @@ do
     end
 end
 
---return helpers
+return helpers
 
diff --git a/mod/tex/context/third/rst/rst_parser.lua b/mod/tex/context/third/rst/rst_parser.lua
index ec9366e..2aafbf5 100644
--- a/mod/tex/context/third/rst/rst_parser.lua
+++ b/mod/tex/context/third/rst/rst_parser.lua
@@ -10,13 +10,13 @@
 --
 
 local rst
-local helpers         = {}
 local optional_setups
 
+thirddata             = thirddata or { }
+thirddata.rst         = { }
+thirddata.rst_helpers = { }
+local helpers         = thirddata.rst_helpers
 if context then
-    thirddata             = thirddata or { }
-    thirddata.rst         = { }
-    thirddata.rst_helpers = helpers
     --thirddata.rst_setups  = optional_setups
 
     environment.loadluafile("rst_helpers")
@@ -27,10 +27,11 @@ if context then
     rst             = rst_context
     optional_setups = thirddata.rst_setups
 else
-    rst             = require "rst_context"
-    helpers         = require "rst_helpers"
-    optional_setups = require "rst_setups"
+    --helpers         = require "rst_helpers"
+    require "rst_helpers"
     rst_directives  = require "rst_directives"
+    optional_setups = require "rst_setups"
+    rst             = require "rst_context"
 end
 
 helpers.rst_debug = false
diff --git a/mod/tex/context/third/rst/t-rst.mkiv b/mod/tex/context/third/rst/t-rst.mkiv
index 829a895..e047775 100644
--- a/mod/tex/context/third/rst/t-rst.mkiv
+++ b/mod/tex/context/third/rst/t-rst.mkiv
@@ -96,7 +96,7 @@
 %%% Wolfgang’s code below; needs testing
 %\unexpanded\def\startRST{%
   %\begingroup
-  %\setcatcodetable \RSTcatcodes
+  %\setcatcodetable \RST_catcodes
   %\dostartRST%
 %}
 
@@ -109,7 +109,7 @@
 
 %\def\RST{%
   %\begingroup
-  %\setcatcodetable \RSTcatcodes
+  %\setcatcodetable \RST_catcodes
   %\doRST%
 %}