summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-19 00:02:38 +0000
committerKarl Berry <karl@freefriends.org>2019-11-19 00:02:38 +0000
commit0f1deee61c0b9018ed89701f331c2456d43c47fe (patch)
tree6e2c74f62a1b9232e8633f66a8b4131635299e20 /Master/texmf-dist/tex
parent1f48a39d4581ae7ec8027d54101e7f29fe95f548 (diff)
luatexja (19nov19)
git-svn-id: svn://tug.org/texlive/trunk@52855 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua5
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty6
3 files changed, 7 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
index 5510305dca1..685cea7191d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/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/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 3956193af06..82a5615306d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/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/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
index 5663551bea4..3e94cfba81f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/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