[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Simplify multiscript (0e74272)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/0e74272780d0e6174a86feefbde4a70f59fe7279

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

commit 0e74272780d0e6174a86feefbde4a70f59fe7279
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Thu Dec 19 01:03:35 2019 +0100

    Simplify multiscript


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

0e74272780d0e6174a86feefbde4a70f59fe7279
 src/luaotfload-multiscript.lua | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/luaotfload-multiscript.lua b/src/luaotfload-multiscript.lua
index 7c6641f..927b5d9 100644
--- a/src/luaotfload-multiscript.lua
+++ b/src/luaotfload-multiscript.lua
@@ -134,15 +134,9 @@ local function load_on_demand(specifications, size)
       definers.register(f, fid)
     elseif f then
       fid = f
-      f = font.getfont(fid)
     end
-    local v = {
-      fid = fid,
-      font = f,
-      characters = f.characters,
-    }
-    t[k] = v
-    return v
+    t[k] = fid
+    return fid
   end})
 end
 
@@ -276,7 +270,7 @@ function domultiscript(head, _, _, _, direction)
       last_script = mapped_scr
       local mapped_font = last_fonts[mapped_scr]
       if mapped_font then
-        setfont(cur, mapped_font.fid)
+        setfont(cur, mapped_font)
       end
     end
   end
@@ -296,10 +290,7 @@ otffeatures.register {
   description = "Combine fonts for multiple scripts",
   manipulators = {
     node = makecombifont,
-  },
-  -- HACK: harf should call manipulators too.
-  initializers = {
-    plug = function(a, b) return makecombifont(a, nil, b) end,
+    plug = makecombifont,
   },
   -- processors = { -- processors would be nice, but they are applied
   --                -- too late for our purposes