[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Smaller fixes (344aca0)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/344aca09696b6bd42ff0c1544b262af511cf8468

>---------------------------------------------------------------

commit 344aca09696b6bd42ff0c1544b262af511cf8468
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Fri Oct 30 07:36:13 2020 +0100

    Smaller fixes


>---------------------------------------------------------------

344aca09696b6bd42ff0c1544b262af511cf8468
 src/luaotfload-harf-plug.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/luaotfload-harf-plug.lua b/src/luaotfload-harf-plug.lua
index fc196e6..3d25ffa 100644
--- a/src/luaotfload-harf-plug.lua
+++ b/src/luaotfload-harf-plug.lua
@@ -215,12 +215,13 @@ local function itemize(head, fontid, direction)
           after_cluster = #codes - (lastrun.start or 0) + 1 + length(rep),
         }
         if rep then
-          setlink(prev, rep)
           setlink(rep_tail, next)
           setnext(n, rep) -- This one is just to keep the loop going
+          n = rep
         else
-          setlink(prev, next)
+          n = next
         end
+        setlink(prev, n)
         code = nil
         skip = false
         if not prev then
@@ -248,7 +249,7 @@ local function itemize(head, fontid, direction)
     local ncodes = #codes -- Necessary to count discs correctly
     codes[ncodes + 1] = code
 
-    if lastdir ~= currdir or lastskip ~= skip then
+    if (disc or not in_disc) and (lastdir ~= currdir or lastskip ~= skip) then
       if disc then
         disc.after_cluster = disc.after_cluster - disc.anchor_cluster
         disc.anchor_cluster = 0
@@ -708,7 +709,7 @@ local function tonodes(head, node, run, glyphs)
 
       setdisc(node, tonodes(pre.head, pre.head, pre.run, pre.glyphs),
                     tonodes(post.head, post.head, post.run, post.glyphs),
-                    tonodes(rep.head, rep.head, rep.run, rep.glyphs))
+                   (tonodes(rep.head, rep.head, rep.run, rep.glyphs)))
       node = getnext(node)
       nodeindex = nodeindex + 1
     else