From: Hironori Kitagawa Date: Wed, 15 Oct 2014 00:58:43 +0000 (+0900) Subject: Fix a bug of prepare_vert_data (when "id" is a number) X-Git-Tag: 20150420.0~107 X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=56a41515e4287965bd9d3bde0234f8cbd076250a;p=luatex-ja%2Fluatexja.git Fix a bug of prepare_vert_data (when "id" is a number) --- diff --git a/src/lltjext.sty b/src/lltjext.sty index 8ce37b7..5cf1849 100644 --- a/src/lltjext.sty +++ b/src/lltjext.sty @@ -653,7 +653,7 @@ %%% kanji \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname} \def\@Kanji#1{\expandafter\kansuji\number #1} -\def\kanji{\iftdir\expandafter\kansuji\fi} +\def\kanji{\ifnum\ltjgetparameter{direction}=3 \expandafter\kansuji\fi} %%% bou %%% diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index b6ceff6..0669b83 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -622,7 +622,7 @@ do local function prepare_vert_data(n, id) -- test if already loaded if type(id)=='number' then -- sometimes id is an integer - font_vert_table[n] = font_vert_table[id]; return + return elseif (not id) or font_vert_table[n] then return end local fname = id.filename @@ -637,7 +637,7 @@ do if a then local s = id.shared.rawdata.descriptions for i,v in pairs(a) do - if v.features.vert or v.features.vrt2 then + if v.features.vert then add_feature_table(v.subtables[1], s, vtable) end end