[latex3-commits] [git/LaTeX3-latex3-luaotfload] harfnode-dev: Fix typo (7e1b900)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : harfnode-dev
Link       : https://github.com/latex3/luaotfload/commit/7e1b900845da413af38661554832114a83fcab48

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

commit 7e1b900845da413af38661554832114a83fcab48
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Tue Oct 15 12:08:06 2019 +0200

    Fix typo


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

7e1b900845da413af38661554832114a83fcab48
 src/luaotfload-harf-define.lua | 8 ++++----
 src/luaotfload-harf-plug.lua   | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/luaotfload-harf-define.lua b/src/luaotfload-harf-define.lua
index 6ca6f22..ab7147b 100644
--- a/src/luaotfload-harf-define.lua
+++ b/src/luaotfload-harf-define.lua
@@ -330,10 +330,10 @@ fonts.readers.harf = function(spec)
   spec.hb_features = hb_features
 
   if rawfeatures.language then
-    spec.language = harf.Language.new(rawfeatures.language)
+    spec.language = hb.Language.new(rawfeatures.language)
   end
   if rawfeatures.script then
-    spec.script = harf.Script.new(rawfeatures.script)
+    spec.script = hb.Script.new(rawfeatures.script)
   end
   for key, val in next, rawfeatures do
     if key:len() == 4 then
@@ -341,10 +341,10 @@ fonts.readers.harf = function(spec)
       -- some checks below. We put non feature options in the `options` dict.
       if val == true or val == false then
         val = (val and '+' or '-')..key
-        hb_features[#hb_features + 1] = harf.Feature.new(val)
+        hb_features[#hb_features + 1] = hb.Feature.new(val)
       elseif tonumber(val) then
         val = '+'..key..'='..tonumber(val) - 1
-        hb_features[#hb_features + 1] = harf.Feature.new(val)
+        hb_features[#hb_features + 1] = hb.Feature.new(val)
       end
     end
   end
diff --git a/src/luaotfload-harf-plug.lua b/src/luaotfload-harf-plug.lua
index 1425aef..e403988 100644
--- a/src/luaotfload-harf-plug.lua
+++ b/src/luaotfload-harf-plug.lua
@@ -318,8 +318,8 @@ function shape(head, node, run)
   local hbshared = hbdata.shared
   local hbfont = hbshared.font
 
-  local lang = options.language or invalid_l
-  local script = options.script or invalid_s
+  local lang = spec.language or invalid_l
+  local script = spec.script or invalid_s
   local shapers = options.shaper and { options.shaper } or {}
 
   local buf = hb.Buffer.new()
@@ -571,7 +571,6 @@ local restore_cmd = { "pdf", "text", "Q" }
 -- Convert glyphs to nodes and collect font characters.
 local function tonodes(head, node, run, glyphs, color)
 local nodeindex = run.start
--- local nodeindex = run.start - (run.codes.offset or 0)
 local dir = run.dir
 local fontid = run.font
 local fontdata = font.getfont(fontid)