summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-09-27 03:00:59 +0000
committerNorbert Preining <norbert@preining.info>2019-09-27 03:00:59 +0000
commit5827a950592f8a91468bcd0b5963d1df8d3518d8 (patch)
treecc7de4d173aa3c2c42e0099e0d6ce358ad969ff3 /macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
parent55b9d356c616c30b8a2892babf47015ca39fb549 (diff)
CTAN sync 201909270300
Diffstat (limited to 'macros/luatex/generic/luatexja/src/ltj-jfmglue.lua')
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-jfmglue.lua15
1 files changed, 7 insertions, 8 deletions
diff --git a/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua b/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
index f94b028452..5510305dca 100644
--- a/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
@@ -1,9 +1,9 @@
--
--- luatexja/ltj-jfmglue.lua
+-- ltj-jfmglue.lua
--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2019/07/26',
+ date = '2019/09/26',
description = 'Insertion process of JFM glues, [x]kanjiskip and others',
})
luatexja.jfmglue = luatexja.jfmglue or {}
@@ -12,7 +12,8 @@ luatexja.load_module('base'); local ltjb = luatexja.base
luatexja.load_module('stack'); local ltjs = luatexja.stack
luatexja.load_module('jfont'); local ltjf = luatexja.jfont
luatexja.load_module('direction'); local ltjd = luatexja.direction
-luatexja.load_module('setwidth'); local ltjw = luatexja.setwidth
+luatexja.load_module('setwidth'); local ltjw = luatexja.setwidth
+luatexja.load_module('lotf_aux'); local ltju = luatexja.lotf_aux
local pairs = pairs
--local to_node = node.direct.tonode
@@ -312,13 +313,11 @@ do -- 002 ---------------------------------------
local getwhd = node.direct.getwhd
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
local attr_jchar_code = luatexbase.attributes['ltj@charcode']
- local identifiers = fonts.hashes.identifiers
+ local font_getfont = font.getfont
local function calc_np_notdef(lp)
- local ident = identifiers[getfont(lp)]
- if not ident.descriptions[getchar(lp)] then
+ if not font_getfont(getfont(lp)).characters[getchar(lp)] then
local ln = node_next(lp)
- if (ident.shared and ident.shared.features and ident.shared.features.notdef)
- and ln and getid(ln)==id_glyph then
+ if ltju.specified_feature(getfont(lp), 'notdef') and ln and getid(ln)==id_glyph then
set_attr(lp, attr_icflag, PROCESSED)
set_attr(ln, attr_jchar_code, has_attr(lp, attr_jchar_code) or getchar(lp))
set_attr(ln, attr_jchar_class, has_attr(lp, attr_jchar_class) or 0)