1 files changed, 26 insertions, 14 deletions
diff --git a/tex/context/base/trac-ctx.lua b/tex/context/base/trac-ctx.lua
index 813443816..706e7a244 100644
--- a/tex/context/base/trac-ctx.lua
+++ b/tex/context/base/trac-ctx.lua
@@ -6,31 +6,43 @@ if not modules then modules = { } end modules ['trac-ctx'] = {
     license   = "see context related readme files"
 }
 
-local commands, context = commands, context
+local commands = commands
+local context  = context
+local register = trackers.register
 
-tex.trackers = tex.trackers or { }
+local textrackers   = tex.trackers   or { }
+local texdirectives = tex.directives or { }
 
-local textrackers = tex.trackers
-local register    = trackers.register
+tex.trackers   = textrackers
+tex.directives = texdirectives
 
-storage.register("tex/trackers",textrackers,"tex.trackers")
+storage.register("tex/trackers",  textrackers,  "tex.trackers")
+storage.register("tex/directives",texdirectives,"tex.directives")
 
-local function doit(tag,v)
-    local tt = textrackers[tag]
+local function doit(category,tag,v)
+    local tt = category[tag]
     if tt then
         context.unprotect()
-        context(v and tt[1] or tt[2])
+        context(v and tt[1] or tt[2]) -- could be one call
         context.protect()
     end
 end
 
-function commands.initializetextrackers()
-    for tag, commands in next, textrackers do
-        register(tag, function(v) doit(tag,v) end) -- todo: v,tag in caller
+local function initialize(category,register)
+    for tag, commands in next, category do
+        register(tag, function(v) doit(category,tag,v) end) -- todo: v,tag in caller
     end
 end
 
-function commands.installtextracker(tag,enable,disable)
-    textrackers[tag] = { enable, disable }
-    register(tag, function(v) doit(tag,v) end) -- todo: v,tag in caller
+local function install(category,register,tag,enable,disable)
+    category[tag] = { enable, disable }
+    register(tag, function(v) doit(category,tag,v) end) -- todo: v,tag in caller
 end
+
+function commands.initializetextrackers  () initialize(textrackers  ,trackers  .register  ) end
+function commands.initializetexdirectives() initialize(texdirectives,directives.register) end
+
+-- commands.install(tag,enable,disable):
+
+function commands.installtextracker  (...) install(textrackers  ,trackers  .register,...) end
+function commands.installtexdirective(...) install(texdirectives,directives.register,...) end