[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Prefer abc in multiscript=auto+abc (987354e)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/987354ebee3763133f91278593dd672a972f9382

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

commit 987354ebee3763133f91278593dd672a972f9382
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Wed Jan 22 01:43:49 2020 +0100

    Prefer abc in multiscript=auto+abc


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

987354ebee3763133f91278593dd672a972f9382
 src/luaotfload-multiscript.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/luaotfload-multiscript.lua b/src/luaotfload-multiscript.lua
index 574e69a..864c56a 100644
--- a/src/luaotfload-multiscript.lua
+++ b/src/luaotfload-multiscript.lua
@@ -232,7 +232,7 @@ local function makecombifont(tfmdata, _, additional_scripts)
       end
       for script, scr_fb in next, fallbacks do
         local iso_script = script_to_iso(script)
-        if is_dominant_script(scr_fb, script, script_to_ot(iso_script)) then
+        if not additional_scripts[iso_script] and is_dominant_script(scr_fb, script, script_to_ot(iso_script)) then
           local main = scr_fb[1]
           table.remove(scr_fb, 1)
           local fbid = luaotfload.add_fallback(scr_fb)
@@ -244,7 +244,7 @@ local function makecombifont(tfmdata, _, additional_scripts)
       local collected = collect_scripts(tfmdata)
       for script in next, collected do
         local iso_script = script_to_iso(script)
-        if is_dominant_script(collected, script, script_to_ot(iso_script)) then
+        if not additional_scripts[iso_script] and is_dominant_script(collected, script, script_to_ot(iso_script)) then
           additional_scripts[iso_script] = spec.specification .. ';-multiscript;script=' .. script
           ---- FIXME: IMHO the following which just modiefies the spec
           --   would be nicer, but it breaks font patching callbacks