From: Hironori Kitagawa Date: Tue, 27 Aug 2019 10:36:20 +0000 (+0900) Subject: make U+200D alchar X-Git-Tag: 20190926.0~26 X-Git-Url: http://git.osdn.net/view?p=luatex-ja%2Fluatexja.git;a=commitdiff_plain;h=862ec7546f206576b46c2a17d78ccadee0a8d66b make U+200D alchar --- diff --git a/src/jfm-prop.lua b/src/jfm-prop.lua index 71dc1ae..e565592 100644 --- a/src/jfm-prop.lua +++ b/src/jfm-prop.lua @@ -4,6 +4,6 @@ luatexja.jfont.define_jfm { [0] = { align = 'left', left = 0.0, down = 0.0, - width = 'prop', height = 0.88, depth = 0.12, italic=0.0, + width = 'prop', height = 'prop', depth = 'prop', italic=0.0, } } diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index 82e2808..2ef0c47 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2019/07/08', + date = '2019/08/27', description = 'Loader for Japanese fonts', }) @@ -93,10 +93,10 @@ function luatexja.jfont.define_jfm(to) v.width = nil end if type(v.height)~='number' then - v.height = (jfm_dir=='tate') and 0.0 + v.height = (jfm_dir=='tate') and 0.0 or nil end if type(v.depth)~='number' then - v.depth = (jfm_dir=='tate') and 0.0 + v.depth = (jfm_dir=='tate') and 0.0 or nil end if type(v.italic)~='number' then v.italic = 0.0 diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty index 4277998..53a8729 100644 --- a/src/ltj-plain.sty +++ b/src/ltj-plain.sty @@ -14,7 +14,7 @@ \ifltj@in@latex %<*LaTeX> \NeedsTeXFormat{LaTeX2e} \PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.} - \ProvidesPackage{ltj-plain}[2019/05/01] + \ProvidesPackage{ltj-plain}[2019/08/27] \fi % %%------------------ @@ -80,7 +80,7 @@ "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF, "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF, - "1F300-"1FFFF + "1F300-"1FFFF, "200D } % non-Japanese \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF} \ltjdefcharrange{6}{% diff --git a/src/luatexja.lua b/src/luatexja.lua index 4a4de62..fb0e12c 100644 --- a/src/luatexja.lua +++ b/src/luatexja.lua @@ -410,7 +410,8 @@ local function debug_show_node_X(p,print_fn, limit) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' if pt == 'glyph' then s = base .. ' ' .. - (p.char>=0xF0000 and string.format('(U+%X)', p.char) or utfchar(p.char)) .. ' ' + (p.char<0xF0000 and utfchar(p.char) or '') + .. string.format(' (U+%X) ', p.char) .. tostring(p.font) .. ' (' .. print_scaled(p.height) .. '+' .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) if p.xoffset~=0 or p.yoffset~=0 then diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty index 52649e8..7ea758b 100644 --- a/src/patches/lltjdefs.sty +++ b/src/patches/lltjdefs.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2019/08/21 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2019/08/27 Default font settings of LuaTeX-ja] \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi @@ -106,7 +106,7 @@ "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF, "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF, - "1F300-"1FFFF + "1F300-"1FFFF, "200D } % non-Japanese \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF} \ltjdefcharrange{6}{%