[latex3-commits] [git/LaTeX3-latex3-luaotfload] bidi-dev: Merge branches 'bidi' and 'multiscript' into multibidi (b30c444)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : bidi-dev
Link       : https://github.com/latex3/luaotfload/commit/b30c444f2ec84c91982405d088da6d623ecd27e4

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

commit b30c444f2ec84c91982405d088da6d623ecd27e4
Merge: ac681a2 305a598
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Wed Aug 14 17:50:58 2019 +0200

    Merge branches 'bidi' and 'multiscript' into multibidi


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

b30c444f2ec84c91982405d088da6d623ecd27e4
 src/luaotfload-init.lua                            |   1 +
 src/luaotfload-main.lua                            |   1 +
 src/luaotfload-multiscript.lua                     | 208 +++++++++++++++++++++
 texmf/tex/luatex/luaotfload/luaotfload-init.lua    |   1 +
 texmf/tex/luatex/luaotfload/luaotfload-main.lua    |   1 +
 .../luatex/luaotfload/luaotfload-multiscript.lua   | 208 +++++++++++++++++++++
 6 files changed, 420 insertions(+)

diff --cc src/luaotfload-init.lua
index 49ec74b,261044c..08736c5
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@@ -649,9 -649,9 +649,10 @@@ local init_post_install_callbacks = fun
    local handler = nodes.simple_font_handler
    local callback = function(head, groupcode, _, _, direction)
      if not direction then
 -      direction = tex.get'textdir'
 +      direction = head.dir or tex.textdir
      end
 +    head = dobidi(head, nil, nil, nil, direction)
+     domultiscript(head, nil, nil, nil, direction)
      return handler(head, groupcode, nil, nil, direction)
    end
    luatexbase.add_to_callback("pre_linebreak_filter",
diff --cc src/luaotfload-main.lua
index fd759ba,85ba1a7..6d6ebb6
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@@ -301,7 -301,7 +301,8 @@@ luaotfload.main = function (
      loadmodule "embolden"     --- fake bold
      loadmodule "notdef"       --- missing glyph handling
      initialize "auxiliary"    --- additional high-level functionality
 +    loadmodule "bidi"         --- ...
+     loadmodule "multiscript"  --- ...
  
      luaotfload.aux.start_rewrite_fontname () --- to be migrated to fontspec
  
diff --cc texmf/tex/luatex/luaotfload/luaotfload-init.lua
index 49ec74b,261044c..08736c5
--- a/texmf/tex/luatex/luaotfload/luaotfload-init.lua
+++ b/texmf/tex/luatex/luaotfload/luaotfload-init.lua
@@@ -649,9 -649,9 +649,10 @@@ local init_post_install_callbacks = fun
    local handler = nodes.simple_font_handler
    local callback = function(head, groupcode, _, _, direction)
      if not direction then
 -      direction = tex.get'textdir'
 +      direction = head.dir or tex.textdir
      end
 +    head = dobidi(head, nil, nil, nil, direction)
+     domultiscript(head, nil, nil, nil, direction)
      return handler(head, groupcode, nil, nil, direction)
    end
    luatexbase.add_to_callback("pre_linebreak_filter",
diff --cc texmf/tex/luatex/luaotfload/luaotfload-main.lua
index fd759ba,85ba1a7..6d6ebb6
--- a/texmf/tex/luatex/luaotfload/luaotfload-main.lua
+++ b/texmf/tex/luatex/luaotfload/luaotfload-main.lua
@@@ -301,7 -301,7 +301,8 @@@ luaotfload.main = function (
      loadmodule "embolden"     --- fake bold
      loadmodule "notdef"       --- missing glyph handling
      initialize "auxiliary"    --- additional high-level functionality
 +    loadmodule "bidi"         --- ...
+     loadmodule "multiscript"  --- ...
  
      luaotfload.aux.start_rewrite_fontname () --- to be migrated to fontspec