luatexko (21apr18)

git-svn-id: svn://tug.org/texlive/trunk@47512 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 14 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty b/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty
index 7d21ec88e3f..b91570c9b80 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty
@@ -17,7 +17,7 @@
   \ifcsname ifpdf\endcsname\else \input ifpdf.sty \fi
   \catcode`@ = 11
 \else
-  \ProvidesPackage{luatexko-core}[2018/04/06 v1.19 Typesetting Korean with LuaTeX]
+  \ProvidesPackage{luatexko-core}[2018/04/19 v1.20 Typesetting Korean with LuaTeX]
   \RequirePackage{luaotfload}[2016/04/21]
   \RequirePackage{ifpdf}
 \fi
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua b/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
index 915da8cd9c5..c31745cf2bc 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
@@ -13,8 +13,8 @@
 
 luatexbase.provides_module {
   name        = 'luatexko',
-  date        = '2018/04/06',
-  version     = '1.19',
+  date        = '2018/04/19',
+  version     = '1.20',
   description = 'Korean linebreaking and font-switching',
   author      = 'Dohyun Kim, Soojin Nam',
   license     = 'LPPL v1.3+',
@@ -119,10 +119,11 @@ local d_remove_node     = nodedirect.remove
 local d_nodenew         = nodedirect.new
 local d_nodecount       = nodedirect.count
 local d_end_of_math     = nodedirect.end_of_math
-local d_nodetail        = nodedirect.tail
+local d_nodetail        = nodedirect.slide -- tail seems to be no good
 local d_nodedimensions  = nodedirect.dimensions
 local d_nodefree        = nodedirect.free
 local d_nodewrite       = nodedirect.write
+local d_node_zero_glue  = nodedirect.is_zero_glue
 
 local emsize = 655360
 
@@ -613,28 +614,28 @@ local function d_get_hlist_char_first (hlist)
       local c,f = d_get_hlist_char_first(curr)
       if c then return c,f end
     elseif currid == gluenode then
-      if d_getglue(curr) ~= 0 then return end
+      if not d_node_zero_glue(curr) then return end
     end
     curr = d_getnext(curr)
   end
 end
 
-local function d_get_hlist_char_last (hlist,prevchar,prevfont)
+local function d_get_hlist_char_last (hlist,c,f)
   local curr = d_nodetail(d_getlist(hlist))
   while curr do
     local currid = d_getid(curr)
     if currid == glyphnode then
-      local c,f = d_get_unicode_char(curr), d_getfont(curr)
-      if c and not is_unicode_vs(c) then return c,f end -- bypass VS
+      c, f = d_get_unicode_char(curr), d_getfont(curr)
+      if c and not is_unicode_vs(c) then break end -- bypass VS
     elseif currid == hlistnode or currid == vlistnode then
-      local c,f = d_get_hlist_char_last(curr)
-      if c then return c,f end
+      c, f = d_get_hlist_char_last(curr)
+      if c then break end
     elseif currid == gluenode then
-      if d_getglue(curr) ~= 0 then return end
+      if not d_node_zero_glue(curr) then break end
     end
     curr = d_getprev(curr)
   end
-  return prevchar, prevfont
+  return c, f
 end
 
 ----------------------------
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty b/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
index 6d054c4001e..aaa7e923ffa 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
@@ -23,7 +23,7 @@
   \expandafter\endinput
 \fi
 
-\ProvidesPackage{luatexko}[2018/04/06 v1.19 Typesetting Korean with LuaLaTeX]
+\ProvidesPackage{luatexko}[2018/04/19 v1.20 Typesetting Korean with LuaLaTeX]
 
 \ifdefined\adjustspacing\else % luatex < 0.87
   \let\adjustspacing\pdfadjustspacing