[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Merge branch 'flags-dev' into dev (0a8d10a)

[Marcel Fabian Krüger]

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

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

commit 0a8d10a3c9658e4366e49e42f843711c3a0f7155
Merge: eec9dff df24d93
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Sun Feb 23 04:55:51 2020 +0100

    Merge branch 'flags-dev' into dev


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

0a8d10a3c9658e4366e49e42f843711c3a0f7155
 src/luaotfload-harf-define.lua |  6 ++++++
 src/luaotfload-harf-plug.lua   |  3 +++
 src/luaotfload-main.lua        |  8 ++++----
 src/luaotfload-notdef.lua      | 30 ++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --cc src/luaotfload-harf-define.lua
index d8b0af7,d5adba1..26e1fe7
--- a/src/luaotfload-harf-define.lua
+++ b/src/luaotfload-harf-define.lua
@@@ -20,11 -20,12 +20,16 @@@ en
  
  local stringlower = string.lower
  local stringupper = string.upper
 +local gsub = string.gsub
  
  local hb = luaotfload.harfbuzz
 +local scriptlang_to_harfbuzz = require'luaotfload-scripts'.to_harfbuzz
  
+ local harf_settings = luaotfload.harf or {}
+ luaotfload.harf = harf_settings
+ 
++harf_settings.default_buf_flags = hb.Buffer.FLAGS_DEFAULT or 0
++
  local hbfonts = {}
  
  local cfftag  = hb.Tag.new("CFF ")
@@@ -322,10 -335,13 +327,11 @@@ local function scalefont(data, spec
      },
      hb = {
        scale = scale,
 -      spec = spec,
        palette = palette,
        shared = data,
 -      letterspace = letterspace,
 -      hscale = hscale,
 -      vscale = vscale,
 +      hscale = upem,
 +      vscale = upem,
+       buf_flags = harf_settings.default_buf_flags,
      },
      specification = spec,
      shared = {},
diff --cc src/luaotfload-main.lua
index a0506b9,a9216e0..cb4f636
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@@ -324,16 -306,17 +324,16 @@@ luaotfload.main = function (
  
      initialize "features"     --- font request and feature handling
  
 -    local harfstatus, harfbuzz = pcall(require, 'luaharfbuzz')
+     if harfstatus then
 -        luaotfload.harfbuzz = harfbuzz
+         loadmodule "harf-define"
+         loadmodule "harf-plug"
+     end
      loadmodule "letterspace"  --- extra character kerning
      loadmodule "embolden"     --- fake bold
      loadmodule "notdef"       --- missing glyph handling
 +    loadmodule "suppress"     --- suppress ligatures by adding ZWNJ
 +    loadmodule "szss"       --- missing glyph handling
-     if harfstatus then
-         loadmodule "harf-define"
-         loadmodule "harf-plug"
-     end
      initialize "auxiliary"    --- additional high-level functionality
 -    loadmodule "multiscript"  --- ...
      loadmodule "tounicode"
  
      luaotfload.aux.start_rewrite_fontname () --- to be migrated to fontspec