beta 2012.10.05 19:52

1 files changed, 27 insertions, 25 deletions

diff --git a/tex/context/base/node-tra.lua b/tex/context/base/node-tra.lua
index 387dd99a6..6b5f49964 100644
--- a/tex/context/base/node-tra.lua
+++ b/tex/context/base/node-tra.lua
@@ -46,6 +46,7 @@ local copy_node_list  = node.copy_list
 local hpack_node_list = node.hpack
 local free_node_list  = node.flush_list
 local traverse_nodes  = node.traverse
+local traverse_by_id  = node.traverse_id
 
 local nodecodes       = nodes.nodecodes
 local whatcodes       = nodes.whatcodes
@@ -352,7 +353,7 @@ end
 
 function nodes.handlers.checkglyphs(head,message)
     local t = { }
-    for g in traverse_id(glyph_code,head) do
+    for g in traverse_by_id(glyph_code,head) do
         t[#t+1] = format("U+%04X:%s",g.char,g.subtype)
     end
     if #t > 0 then
@@ -714,72 +715,73 @@ local get_attribute   = node.has_attribute
 local set_attribute   = node.set_attribute
 local unset_attribute = node.unset_attribute
 
-local attribute  = attributes.private('color')
-local colormodel = attributes.private('colormodel')
-local mapping    = attributes.list[attribute] or { }
+local a_color         = attributes.private('color')
+local a_colormodel    = attributes.private('colormodel')
+local a_state         = attributes.private('state')
+local m_color         = attributes.list[a_color] or { }
 
 function colors.set(n,c,s)
-    local mc = mapping[c]
+    local mc = m_color[c]
     if not mc then
-        unset_attribute(n,attribute)
+        unset_attribute(n,a_color)
     else
-        if not get_attribute(n,colormodel) then
-            set_attribute(n,colormodel,s or 1)
+        if not get_attribute(n,a_colormodel) then
+            set_attribute(n,a_colormodel,s or 1)
         end
-        set_attribute(n,attribute,mc)
+        set_attribute(n,a_color,mc)
     end
 end
 
 function colors.setlist(n,c,s)
     while n do
-        local mc = mapping[c]
+        local mc = m_color[c]
         if not mc then
-            unset_attribute(n,attribute)
+            unset_attribute(n,a_color)
         else
-            if not get_attribute(n,colormodel) then
-                set_attribute(n,colormodel,s or 1)
+            if not get_attribute(n,a_colormodel) then
+                set_attribute(n,a_colormodel,s or 1)
             end
-            set_attribute(n,attribute,mc)
+            set_attribute(n,a_color,mc)
         end
         n = n.next
     end
 end
 
 function colors.reset(n)
-    unset_attribute(n,attribute)
+    unset_attribute(n,a_color)
 end
 
 -- maybe
 
-local transparencies = { }
+local transparencies   = { }
 tracers.transparencies = transparencies
 
-local attribute = attributes.private('transparency')
-local mapping   = attributes.list[attribute] or { }
+local a_transparency   = attributes.private('transparency')
+local m_transparency   = attributes.list[a_transparency] or { }
 
 function transparencies.set(n,t)
-    local mt = mapping[t]
+    local mt = m_transparency[t]
     if not mt then
-        unset_attribute(n,attribute)
+        unset_attribute(n,a_transparency)
     else
-        set_attribute(n,attribute,mt)
+        set_attribute(n,a_transparency,mt)
     end
 end
 
 function transparencies.setlist(n,c,s)
     while n do
-        local mt = mapping[c]
+        local mt = m_transparency[c]
         if not mt then
-            unset_attribute(n,attribute)
+            unset_attribute(n,a_transparency)
         else
-            set_attribute(n,attribute,mt)
+            set_attribute(n,a_transparency,mt)
         end
         n = n.next
     end
 end
 
 function transparencies.reset(n)
-    unset_attribute(n,attribute)
+    unset_attribute(n,a_transparency)
 end
 
 -- for the moment here