summaryrefslogtreecommitdiff
path: root/macros/luatex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-11-19 03:02:21 +0000
committerNorbert Preining <norbert@preining.info>2019-11-19 03:02:21 +0000
commit025f7bfee79d7817a876831bb19f34a2dfb1b2e2 (patch)
tree76efc8c89514583aae7ddb55b59bfb879500a09d /macros/luatex
parent96f9362fc3e3bb70fa2411c62418c42d9acda4d7 (diff)
CTAN sync 201911190302
Diffstat (limited to 'macros/luatex')
-rw-r--r--macros/luatex/generic/luatexja/README8
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-en.pdfbin530396 -> 530396 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-ja.pdfbin935893 -> 935894 bytes
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-jfmglue.lua5
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.sty2
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjp-microtype.sty6
6 files changed, 11 insertions, 10 deletions
diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README
index 5086578af9..ecd65df1e4 100644
--- a/macros/luatex/generic/luatexja/README
+++ b/macros/luatex/generic/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20191117.0
+The LuaTeX-ja Package 20191118.0
--------------------------------
Copyright (c) 2011--2019 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -43,9 +43,9 @@ Installation
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20191117.0 in the Git repository by
+ or tagged as 20191118.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20191117.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20191118.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -93,4 +93,4 @@ Notes
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Sun Nov 17 18:30:58 2019 +0900
+Last commit date: Mon Nov 18 21:38:16 2019 +0900
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
index b23ce9bcd2..eb9e2513e3 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
index 52ede1e3ec..4be46efdc5 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
Binary files differ
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