diff options
author | Norbert Preining <norbert@preining.info> | 2019-11-19 03:02:21 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-11-19 03:02:21 +0000 |
commit | 025f7bfee79d7817a876831bb19f34a2dfb1b2e2 (patch) | |
tree | 76efc8c89514583aae7ddb55b59bfb879500a09d /macros/luatex/generic/luatexja/src | |
parent | 96f9362fc3e3bb70fa2411c62418c42d9acda4d7 (diff) |
CTAN sync 201911190302
Diffstat (limited to 'macros/luatex/generic/luatexja/src')
-rw-r--r-- | macros/luatex/generic/luatexja/src/ltj-jfmglue.lua | 5 | ||||
-rw-r--r-- | macros/luatex/generic/luatexja/src/luatexja.sty | 2 | ||||
-rw-r--r-- | macros/luatex/generic/luatexja/src/patches/lltjp-microtype.sty | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua b/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua index 5510305dca..685cea7191 100644 --- a/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua +++ b/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua @@ -31,9 +31,10 @@ local if_lang_ja do local lang_ja = luatexja.lang_ja local getlang = node.direct.getlang + -- glyph with font number 0 (\nullfont) is always considered an ALchar node if_lang_ja = getlang - and function (n) return getlang(n)==lang_ja end - or function (n) return getfield(n,'lang')==lang_ja end + and function (n) return (getlang(n)==lang_ja)and(getfont(n)~=0) end + or function (n) return (getfield(n,'lang')==lang_ja)and(getfont(n)~=0) end end local has_attr = node.direct.has_attribute diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty index 3956193af0..82a5615306 100644 --- a/macros/luatex/generic/luatexja/src/luatexja.sty +++ b/macros/luatex/generic/luatexja/src/luatexja.sty @@ -41,7 +41,7 @@ \ProcessOptions\relax \fi %</LaTeX> %%%% VERSION -\def\LuaTeXjaversion{20191117.0} +\def\LuaTeXjaversion{20191118.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-microtype.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-microtype.sty index 5663551bea..3e94cfba81 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjp-microtype.sty +++ b/macros/luatex/generic/luatexja/src/patches/lltjp-microtype.sty @@ -14,21 +14,21 @@ {\xdef\MT@font@list{\MT@font@list\MT@font,}}% {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}% \unless\ifin@ - \xdef\MT@font@list{\MT@font@list\MT@font,} + \xdef\MT@font@list{\MT@font@list\MT@font,}% \fi }{}{} \patchcmd\MT@register@subst@font {\xdef\MT@font@list{\MT@font@list\font@name,}}% {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}% \unless\ifin@ - \xdef\MT@font@list{\MT@font@list\font@name,} + \xdef\MT@font@list{\MT@font@list\font@name,}% \fi}{}{} \let\ltj@MT@tracking@\MT@tracking@ \patchcmd\MT@tracking@ {\xdef\MT@tr@font@list{\MT@tr@font@list\MT@font,}}% {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}% \unless\ifin@ - \xdef\MT@tr@font@list{\MT@tr@font@list\MT@font,} + \xdef\MT@tr@font@list{\MT@tr@font@list\MT@font,}% \fi}{}{} \ifx\MT@tracking\ltj@MT@tracking@\let\MT@tracking\MT@tracking@\fi |