X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=1b4d04df4e743f344c5e79c018c539d8668ee8b2;hb=e9e03ab63bb21484ffecb25bbd5fe88eac4aca3c;hp=9b791a67df1240c43ebc30f3acba6bbe3837b357;hpb=f085560bb8c26829d23b3c20a3b628e8b0690c4b;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index 9b791a6..1b4d04d 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -3,8 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2011/06/27', - version = '0.1', + date = '2011/05/11', description = 'Loader for Japanese fonts', }) module('luatexja.jfont', package.seeall) @@ -16,6 +15,7 @@ local node_new = node.new local has_attr = node.has_attribute local set_attr = node.set_attribute local round = tex.round +local getfont = font.getfont local attr_icflag = luatexbase.attributes['ltj@icflag'] local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] @@ -24,8 +24,9 @@ local id_kern = node.id('kern') local id_glue_spec = node.id('glue_spec') local id_glue = node.id('glue') local cat_lp = luatexbase.catcodetables['latex-package'] -local ITALIC = 1 -local FROM_JFM = 4 +local ITALIC = luatexja.icflag_table.ITALIC +local FROM_JFM = luatexja.icflag_table.FROM_JFM + ------------------------------------------------------------------------ -- LOADING JFM ------------------------------------------------------------------------ @@ -61,7 +62,12 @@ function define_jfm(t) elseif type(w) == 'string' and utf.len(w)==1 then real_char = true; w = utf.byte(w) elseif type(w) == 'string' and utf.len(w)==2 and utf.sub(w,2) == '*' then - real_char = true; w = -utf.byte(utf.sub(w,1,1)) + real_char = true; w = utf.byte(utf.sub(w,1,1)) + if not t.chars[-w] then + t.chars[-w] = i + else + defjfm_res= nil; return + end end if not t.chars[w] then t.chars[w] = i @@ -69,6 +75,9 @@ function define_jfm(t) defjfm_res= nil; return end end + if type(v.align)~='string' then + v.align = 'left' -- left + end if real_char then if not (type(v.width)=='number' or v.width~='prop') then defjfm_res= nil; return @@ -88,9 +97,6 @@ function define_jfm(t) if type(v.down)~='number' then v.down = 0.0 end - if type(v.align)=='nil' then - v.align = 'left' - end end end v.chars = nil @@ -100,6 +106,13 @@ function define_jfm(t) for j in pairs(v.glue) do if v.kern[j] then defjfm_res= nil; return end end + for j,x in pairs(v.kern) do + if type(x)=='number' then + v.kern[j] = {x, 0} + elseif type(x)=='table' then + v.kern[j] = {x[1], x[2] or 0} + end + end t.char_type[i] = v t[i] = nil end @@ -134,10 +147,15 @@ local function update_jfm_cache(j,sz) for i,v in pairs(t.char_type) do if type(i) == 'number' then -- char_type for k,w in pairs(v.glue) do - local g, h = node.new(id_glue), node_new(id_glue_spec); v.glue[k] = g + local g, h = node.new(id_glue), node_new(id_glue_spec) + v.glue[k] = {g, (w[5] and w[5]/sz or 0)} h.width, h.stretch, h.shrink = w[1], w[2], w[3] h.stretch_order, h.shrink_order = 0, 0 - g.subtype = 0; g.spec = h; set_attr(g, attr_icflag, FROM_JFM); + g.subtype = 0; g.spec = h; set_attr(g, attr_icflag, FROM_JFM + + (w[4] and w[4]/sz or 0)); + end + for k,w in pairs(v.kern) do + w[2] = w[2]/sz end end end @@ -155,7 +173,7 @@ luatexbase.create_callback("luatexja.find_char_class", "data", function find_char_class(c,m) -- c: character code, m: if not m then return 0 end - return m.size_cache.chars[c] or + return m.chars[c] or luatexbase.call_callback("luatexja.find_char_class", 0, m, c) end @@ -200,7 +218,7 @@ luatexbase.create_callback("luatexja.define_jfont", "data", function (ft, fn) re function jfontdefY() -- for horizontal font local j = load_jfont_metric() local fn = font.id(cstemp) - local f = font.fonts[fn] + local f = getfont(fn) if not j then ltjb.package_error('luatexja', "bad JFM `" .. jfm_file_name .. "'", @@ -211,8 +229,13 @@ function jfontdefY() -- for horizontal font return end update_jfm_cache(j, f.size) + local sz = metrics[j].size_cache[f.size] local fmtable = { jfm = j, size = f.size, var = jfm_var, - size_cache = metrics[j].size_cache[f.size] } + zw = sz.zw, zh = sz.zh, + chars = sz.chars, char_type = sz.char_type, + kanjiskip = sz.kanjiskip, xkanjiskip = sz.xkanjiskip, + } + fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn) font_metric_table[fn]=fmtable tex.sprint(cat_lp, luatexja.is_global .. '\\protected\\expandafter\\def\\csname ' @@ -223,7 +246,7 @@ end function load_zw() local a = font_metric_table[tex.attribute[attr_curjfnt]] if a then - tex.setdimen('ltj@zw', a.size_cache.zw) + tex.setdimen('ltj@zw', a.zw) else tex.setdimen('ltj@zw',0) end @@ -232,7 +255,7 @@ end function load_zh() local a = font_metric_table[tex.attribute[attr_curjfnt]] if a then - tex.setdimen('ltj@zh', a.size_cache.zh) + tex.setdimen('ltj@zh', a.zh) else tex.setdimen('ltj@zh',0) end @@ -266,17 +289,17 @@ local function extract_metric(name) end -- replace fonts.define.read() -local ljft_dr_orig = fonts.define.read -function fonts.define.read(name, size, id) +function font_callback(name, size, id, fallback) extract_metric(name) -- In the present imple., we don't remove "jfm=..." from name. - return ljft_dr_orig(name, size, id) + return fallback(name, size, id) end ------------------------------------------------------------------------ -- MISC ------------------------------------------------------------------------ +local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char -- EXT: italic correction function append_italic() local p = tex.nest[tex.nest.ptr].tail @@ -284,13 +307,18 @@ function append_italic() local f = p.font local g = node_new(id_kern) g.subtype = 1; node.set_attribute(g, attr_icflag, ITALIC) - if ltjc.is_ucs_in_japanese_char(p) then + if is_ucs_in_japanese_char(p) then f = has_attr(p, attr_curjfnt) local j = font_metric_table[f] - local c = find_char_class(p.char, j) - g.kern = j.size_cache.char_type[c].italic + g.kern = j.char_type[find_char_class(p.char, j)].italic else - g.kern = font.fonts[f].characters[p.char].italic + local h = getfont(f) + if h then + g.kern = h.characters[p.char].italic + else + tex.attribute[attr_icflag] = -(0x7FFFFFFF) + return node.free(g) + end end node.write(g) tex.attribute[attr_icflag] = -(0x7FFFFFFF)