1 files changed, 6 insertions, 10 deletions

diff --git a/tex/context/base/mkxl/toks-aux.lmt b/tex/context/base/mkxl/toks-aux.lmt
index a8bdae5e8..86b796b1e 100644
--- a/tex/context/base/mkxl/toks-aux.lmt
+++ b/tex/context/base/mkxl/toks-aux.lmt
@@ -133,22 +133,22 @@ interfaces.implement {
 local groupcodes       = { }
 local glyphoptioncodes = { }
 local discoptioncodes  = { }
+local mathoptioncodes  = { }
 local hyphenationcodes = { }
 local frozenparcodes   = { }
 local flagcodes        = { }
 local normalizecodes   = { }
--- local parcontextcodes  = { }
--- local parbegincodes    = { }
+----- parcontextcodes  = { }
+----- parbegincodes    = { }
 
 for k, v in next, tex.getgroupvalues()       do groupcodes[k]       = gsub(v,"[_ ]","") end
 for k, v in next, tex.gethyphenationvalues() do hyphenationcodes[k] = gsub(v,"[_ ]","") end
 for k, v in next, tex.getglyphoptionvalues() do glyphoptioncodes[k] = gsub(v,"[_ ]","") end
 for k, v in next, tex.getdiscoptionvalues()  do discoptioncodes[k]  = gsub(v,"[_ ]","") end
+for k, v in next, tex.getmathoptionvalues()  do mathoptioncodes[k]  = gsub(v,"[_ ]","") end
 for k, v in next, tex.getfrozenparvalues()   do frozenparcodes[k]   = gsub(v,"[_ ]","") end
 for k, v in next, tex.getflagvalues()        do flagcodes[k]        = gsub(v,"[_ ]","") end
 for k, v in next, tex.getnormalizevalues()   do normalizecodes[k]   = gsub(v,"[_ ]","") end
--- for k, v in next, tex.getparcontextvalues()  do parcontextcodes[k]  = gsub(v,"[_ ]","") end
--- for k, v in next, tex.getparbeginvalues()    do parbegincodes[k]    = gsub(v,"[_ ]","") end
 
 if environment.initex then
 
@@ -161,27 +161,23 @@ if environment.initex then
     for k, v in next, frozenparcodes   do texintegerdef("frozen" .. v .. "code",   k,"immutable") end
     for k, v in next, flagcodes        do texintegerdef(v .. "flagcode",           k,"immutable") end
     for k, v in next, normalizecodes   do texintegerdef(v .. "code",               k,"immutable") end
- -- for k, v in next, parcontextcodes  do texintegerdef(v .. "parcontextcode",     k,"immutable") end
- -- for k, v in next, parbegincodes    do texintegerdef(v .. "parbegincode",       k,"immutable") end
 
 end
 
 groupcodes           = utilities.storage.allocate(table.swapped(groupcodes,      groupcodes))
 glyphoptioncodes     = utilities.storage.allocate(table.swapped(glyphoptioncodes,glyphoptioncodes))
 discoptioncodes      = utilities.storage.allocate(table.swapped(discoptioncodes, discoptioncodes))
+mathoptioncodes      = utilities.storage.allocate(table.swapped(mathoptioncodes, mathoptioncodes))
 hyphenationcodes     = utilities.storage.allocate(table.swapped(hyphenationcodes,hyphenationcodes))
 frozenparcodes       = utilities.storage.allocate(table.swapped(frozenparcodes,  frozenparcodes))
 flagcodes            = utilities.storage.allocate(table.swapped(flagcodes,       flagcodes))
 normalizecodes       = utilities.storage.allocate(table.swapped(normalizecodes,  normalizecodes))
--- parcontextcodes      = utilities.storage.allocate(table.swapped(parcontextcodes, parcontextcodes))
--- parbegincodes        = utilities.storage.allocate(table.swapped(parbegincodes,   parbegincodes))
 
 tex.groupcodes       = groupcodes
 tex.glyphoptioncodes = glyphoptioncodes
 tex.discoptioncodes  = discoptioncodes
+tex.mathoptioncodes  = mathoptioncodes
 tex.hyphenationcodes = hyphenationcodes
 tex.frozenparcodes   = frozenparcodes
 tex.flagcodes        = flagcodes
 tex.normalizecodes   = normalizecodes
--- tex.parcontextcodes  = parcontextcodes
--- tex.parbegincodes    = parbegincodes