1 files changed, 106 insertions, 106 deletions
diff --git a/tex/context/base/mkiv/scrp-cjk.lua b/tex/context/base/mkiv/scrp-cjk.lua
index 9e6e24f4d..541ea9f81 100644
--- a/tex/context/base/mkiv/scrp-cjk.lua
+++ b/tex/context/base/mkiv/scrp-cjk.lua
@@ -17,54 +17,54 @@ if not modules then modules = { } end modules ['scrp-cjk'] = {
 -- endofline turned into spaces (would not make sense either because otherwise a
 -- wanted space at the end of a line would have to be a hard coded ones.
 
-local nuts               = nodes.nuts
+local nuts              = nodes.nuts
 
-local insert_node_after  = nuts.insert_after
-local insert_node_before = nuts.insert_before
-local copy_node          = nuts.copy
-local remove_node        = nuts.remove
-local nextglyph          = nuts.traversers.glyph
+local insertnodeafter  = nuts.insertafter
+local insertnodebefore = nuts.insertbefore
+local copy_node        = nuts.copy
+local remove_node      = nuts.remove
+local nextglyph        = nuts.traversers.glyph
 
-local getnext            = nuts.getnext
-local getprev            = nuts.getprev
-local getfont            = nuts.getfont
-local getchar            = nuts.getchar
-local getid              = nuts.getid
-local getsubtype         = nuts.getsubtype
-local getwidth           = nuts.getwidth
+local getnext          = nuts.getnext
+local getprev          = nuts.getprev
+local getfont          = nuts.getfont
+local getchar          = nuts.getchar
+local getid            = nuts.getid
+local getsubtype       = nuts.getsubtype
+local getwidth         = nuts.getwidth
 
-local setchar            = nuts.setchar
+local setchar          = nuts.setchar
 
-local nodepool           = nuts.pool
-local new_glue           = nodepool.glue
-local new_kern           = nodepool.kern
-local new_penalty        = nodepool.penalty
+local nodepool         = nuts.pool
+local new_glue         = nodepool.glue
+local new_kern         = nodepool.kern
+local new_penalty      = nodepool.penalty
 
-local nodecodes          = nodes.nodecodes
-local gluecodes          = nodes.gluecodes
+local nodecodes        = nodes.nodecodes
+local gluecodes        = nodes.gluecodes
 
-local glyph_code         = nodecodes.glyph
-local glue_code          = nodecodes.glue
+local glyph_code       = nodecodes.glyph
+local glue_code        = nodecodes.glue
 
-local userskip_code      = gluecodes.userskip
-local spaceskip_code     = gluecodes.spaceskip
-local xspaceskip_code    = gluecodes.xspaceskip
+local userskip_code    = gluecodes.userskip
+local spaceskip_code   = gluecodes.spaceskip
+local xspaceskip_code  = gluecodes.xspaceskip
 
-local hash               = scripts.hash
+local hash             = scripts.hash
 
-local getscriptstatus    = scripts.getstatus
-local getscriptdata      = scripts.getdata
-local scriptcolors       = scripts.colors
+local getscriptstatus  = scripts.getstatus
+local getscriptdata    = scripts.getdata
+local scriptcolors     = scripts.colors
 
-local fonthashes         = fonts.hashes
-local quaddata           = fonthashes.quads
-local spacedata          = fonthashes.spaces
+local fonthashes       = fonts.hashes
+local quaddata         = fonthashes.quads
+local spacedata        = fonthashes.spaces
 
-local decomposed         = characters.hangul.decomposed
+local decomposed       = characters.hangul.decomposed
 
-local trace_details      = false  trackers.register("scripts.details", function(v) trace_details = v end)
+local trace_details    = false  trackers.register("scripts.details", function(v) trace_details = v end)
 
-local report_details     = logs.reporter("scripts","detail")
+local report_details   = logs.reporter("scripts","detail")
 
 -- raggedleft is controlled by leftskip and we might end up with a situation where
 -- the intercharacter spacing interferes with this; the solution is to patch the
@@ -133,206 +133,206 @@ local function nobreak(head,current)
     if trace_details then
         trace_detail(current,"break")
     end
-    insert_node_before(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_penalty(10000))
 end
 
 local function stretch_break(head,current)
     if trace_details then
         trace_detail(current,"stretch break")
     end
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
 end
 
 local function shrink_break(head,current)
     if trace_details then
         trace_detail(current,"shrink break")
     end
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 local function nobreak_stretch(head,current)
     if trace_details then
         trace_detail(current,"no break stretch")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
 end
 
 local function korean_break(head,current)
     if trace_details then
         trace_detail(current,"korean break")
     end
-    insert_node_before(head,current,new_penalty(inter_char_hangul_penalty))
+    insertnodebefore(head,current,new_penalty(inter_char_hangul_penalty))
 end
 
 local function nobreak_shrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak shrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 local function nobreak_autoshrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak autoshrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 local function nobreak_stretch_nobreak_shrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak stretch nobreak shrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 local function nobreak_stretch_nobreak_autoshrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak stretch nobreak autoshrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 local function nobreak_shrink_nobreak_stretch(head,current)
     if trace_details then
         trace_detail(current,"nobreak shrink nobreak stretch")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
 end
 
 local function nobreak_autoshrink_nobreak_stretch(head,current)
     if trace_details then
         trace_detail(current,"nobreak autoshrink nobreak stretch")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
 end
 
 local function nobreak_shrink_break_stretch(head,current)
     if trace_details then
         trace_detail(current,"nobreak shrink break stretch")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
 end
 
 local function nobreak_autoshrink_break_stretch(head,current)
     if trace_details then
         trace_detail(current,"nobreak autoshrink break stretch")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
 end
 
 local function nobreak_shrink_break_stretch_nobreak_shrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak shrink break stretch nobreak shrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
 end
 
 local function japanese_between_full_close_open(head,current) -- todo: check width
     if trace_details then
         trace_detail(current,"japanese between full close open")
     end
-    insert_node_before(head,current,new_kern(-half_char_width))
-    insert_node_before(head,current,new_glue(half_char_width,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_kern(-half_char_width))
+    insertnodebefore(head,current,new_kern(-half_char_width))
+    insertnodebefore(head,current,new_glue(half_char_width,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_kern(-half_char_width))
 end
 
 local function japanese_between_full_close_full_close(head,current) -- todo: check width
     if trace_details then
         trace_detail(current,"japanese between full close full close")
     end
-    insert_node_before(head,current,new_kern(-half_char_width))
- -- insert_node_before(head,current,new_glue(half_char_width,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_kern(-half_char_width))
+ -- insertnodebefore(head,current,new_glue(half_char_width,0,inter_char_half_shrink))
 end
 
 local function japanese_before_full_width_punct(head,current) -- todo: check width
     if trace_details then
         trace_detail(current,"japanese before full width punct")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(quarter_char_width,0,inter_char_quarter_shrink))
-    insert_node_before(head,current,new_kern(-quarter_char_width))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(quarter_char_width,0,inter_char_quarter_shrink))
+    insertnodebefore(head,current,new_kern(-quarter_char_width))
 end
 
 local function japanese_after_full_width_punct(head,current) -- todo: check width
     if trace_details then
         trace_detail(current,"japanese after full width punct")
     end
-    insert_node_before(head,current,new_kern(-quarter_char_width))
-    insert_node_before(head,current,new_glue(quarter_char_width,0,inter_char_quarter_shrink))
+    insertnodebefore(head,current,new_kern(-quarter_char_width))
+    insertnodebefore(head,current,new_glue(quarter_char_width,0,inter_char_quarter_shrink))
 end
 
 local function nobreak_autoshrink_break_stretch_nobreak_autoshrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak autoshrink break stretch nobreak autoshrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 local function nobreak_autoshrink_break_stretch_nobreak_shrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak autoshrink break stretch nobreak shrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 local function nobreak_shrink_break_stretch_nobreak_autoshrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak shrink break stretch nobreak autoshrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
 end
 
 local function nobreak_stretch_break_shrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak stretch break shrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 local function nobreak_stretch_break_autoshrink(head,current)
     if trace_details then
         trace_detail(current,"nobreak stretch break autoshrink")
     end
-    insert_node_before(head,current,new_penalty(10000))
-    insert_node_before(head,current,new_glue(0,inter_char_stretch,0))
-    insert_node_before(head,current,new_glue(0,0,inter_char_half_shrink))
+    insertnodebefore(head,current,new_penalty(10000))
+    insertnodebefore(head,current,new_glue(0,inter_char_stretch,0))
+    insertnodebefore(head,current,new_glue(0,0,inter_char_half_shrink))
 end
 
 -- Korean: hangul
@@ -535,11 +535,11 @@ function scripts.decomposehangul(head)
             setchar(current,lead_consonant)
             local m = copy_node(current)
             setchar(m,medial_vowel)
-            head, current = insert_node_after(head,current,m)
+            head, current = insertnodeafter(head,current,m)
             if tail_consonant then
                 local t = copy_node(current)
                 setchar(t,tail_consonant)
-                head, current = insert_node_after(head,current,t)
+                head, current = insertnodeafter(head,current,t)
             end
             done = true
         end
@@ -961,7 +961,7 @@ local function process(head,first,last)
                 end
                 previous = current
          -- elseif id == math_code then
-         --     upcoming = getnext(end_of_math(current))
+         --     upcoming = getnext(endofmath(current))
          --     previous = "start"
             else -- glue
                 local p = getprev(first)