2016-07-01 16:31:00

1 files changed, 6 insertions, 9 deletions

diff --git a/tex/context/base/mkiv/chem-str.lua b/tex/context/base/mkiv/chem-str.lua
index 0300aae02..9cf12c4c1 100644
--- a/tex/context/base/mkiv/chem-str.lua
+++ b/tex/context/base/mkiv/chem-str.lua
@@ -57,7 +57,6 @@ local v_fit        = variables.fit
 local v_on         = variables.on
 local v_none       = variables.none
 
-local mpnamedcolor = attributes.colors.mpnamedcolor
 local topoints     = number.topoints
 local todimen      = string.todimen
 
@@ -324,12 +323,12 @@ local pattern   =
 -- print(lpegmatch(pattern,"RZ13=x"))      -- 1 RZ false false table x
 
 local f_initialize       = 'if unknown context_chem : input mp-chem.mpiv ; fi ;'
-local f_start_structure  = formatters['chem_start_structure(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);']
+local f_start_structure  = formatters['chem_start_structure(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%q);']
 local f_set_trace_bounds = formatters['chem_trace_boundingbox := %l ;']
 local f_stop_structure   = 'chem_stop_structure;'
 local f_start_component  = 'chem_start_component;'
 local f_stop_component   = 'chem_stop_component;'
-local f_line             = formatters['chem_%s%s(%s,%s,%s,%s,%s);']
+local f_line             = formatters['chem_%s%s(%s,%s,%s,%s,%q);']
 local f_set              = formatters['chem_set(%s);']
 local f_number           = formatters['chem_%s%s(%s,%s,"\\chemicaltext{%s}");']
 local f_text             = f_number
@@ -337,8 +336,6 @@ local f_empty_normal     = formatters['chem_%s(%s,%s,"");']
 local f_empty_center     = formatters['chem_c%s(%s,%s,"");']
 local f_transform        = formatters['chem_%s(%s,%s,%s);']
 
-local prepareMPvariable = commands and commands.prepareMPvariable
-
 local function process(level,spec,text,n,rulethickness,rulecolor,offset,default_variant)
     insert(stack,{ spec = spec, text = text, n = n })
     local txt = #stack
@@ -379,7 +376,7 @@ local function process(level,spec,text,n,rulethickness,rulecolor,offset,default_
                 if t == v_default or t == v_normal or t == "" then
                     rulecolor = saved_rulecolor
                 elseif t then
-                    rulecolor = mpnamedcolor(t)
+                    rulecolor = t
                 end
             elseif operation == "rulethickness" then
                 local t = text
@@ -685,8 +682,8 @@ function chemistry.start(settings)
     local unit           = settings.unit          or 655360
     local bondlength     = settings.factor        or 3
     local rulethickness  = settings.rulethickness or 65536
-    local rulecolor      = settings.rulecolor     or ""
-    local axiscolor      = settings.framecolor    or ""
+    local rulecolor      = settings.rulecolor     or "black"
+    local axiscolor      = settings.framecolor    or "black"
     local scale          = settings.scale         or "normal"
     local rotation       = settings.rotation      or 0
     local offset         = settings.offset        or 0
@@ -751,7 +748,7 @@ function chemistry.start(settings)
         chemistry.structures,
         left, right, top, bottom,
         rotation, topoints(unit), bondlength, scale, topoints(offset),
-        tostring(settings.axis == v_on), topoints(rulethickness), tostring(axiscolor)
+        tostring(settings.axis == v_on), topoints(rulethickness), axiscolor
     )
     metacode[#metacode+1] = f_set_trace_bounds(trace_boundingbox) ;
     --