diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/font-col.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/font-col.lua | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/font-col.lua b/Master/texmf-dist/tex/context/base/mkiv/font-col.lua index cf1b60bb93e..d7b76a61588 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/font-col.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/font-col.lua @@ -24,7 +24,7 @@ local getfont = nuts.getfont local getchar = nuts.getchar local setfield = nuts.setfield -local setchar = nuts.setchar +local setfont = nuts.setfont local traverse_id = nuts.traverse_id local traverse_char = nuts.traverse_char @@ -35,6 +35,9 @@ local trace_collecting = false trackers.register("fonts.collecting", function local report_fonts = logs.reporter("fonts","collections") +local enableaction = nodes.tasks.enableaction +local disableaction = nodes.tasks.disableaction + local collections = fonts.collections or { } fonts.collections = collections @@ -46,7 +49,6 @@ collections.vectors = vectors local fontdata = fonts.hashes.identifiers local chardata = fonts.hashes.characters -local glyph_code = nodes.nodecodes.glyph local currentfont = font.current local fontpatternhassize = fonts.helpers.fontpatternhassize @@ -61,12 +63,12 @@ local function checkenabled() -- a bit ugly but nicer than a fuzzy state while defining math if next(vectors) then if not enabled then - nodes.tasks.enableaction("processors","fonts.collections.process") + enableaction("processors","fonts.collections.process") enabled = true end else if enabled then - nodes.tasks.disableaction("processors","fonts.collections.process") + disableaction("processors","fonts.collections.process") enabled = false end end @@ -257,7 +259,6 @@ end function collections.process(head) -- this way we keep feature processing local done = false - -- for n in traverse_id(glyph_code,tonut(head)) do for n in traverse_char(tonut(head)) do local font = getfont(n) local vector = vectors[font] @@ -274,8 +275,7 @@ function collections.process(head) -- this way we keep feature processing char,font,newchar,newfont,not chardata[newfont][newchar] and " (missing)" or "" ) end - setfield(n,"font",newfont) - setchar(n,newchar) + setfont(n,newfont,newchar) done = true else if trace_collecting then @@ -283,7 +283,7 @@ function collections.process(head) -- this way we keep feature processing font,vect,char,not chardata[vect][char] and " (missing)" or "" ) end - setfield(n,"font",vect) + setfont(n,vect) done = true end end |