X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=aa92cebb151e5e36772c2b7c4deb5746ba14a355;hb=bcdd1199d689c06bf177c0a5b886c21a664558b7;hp=817940871af9140126c0d2b6ae792d119a381acf;hpb=0526b27bf88ed7f2adedef267f4d9226f6f5a692;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index 8179408..aa92ceb 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -54,7 +54,7 @@ luatexbase.create_callback("luatexja.load_jfm", "data", function (ft, jn) return local jfm_file_name, jfm_var local defjfm_res -local jfm_dir +local jfm_dir, is_def_jfont function define_jfm(t) local real_char -- Does current character class have the 'real' character? @@ -78,11 +78,6 @@ function define_jfm(t) 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)) - 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 @@ -141,6 +136,11 @@ end local update_jfm_cache do + local node_copy = Dnode.copy + local kern_skel = node_new(id_kern) + set_attr(kern_skel, attr_icflag, FROM_JFM) + setfield(kern_skel, 'subtype', 1) + local function mult_table(old,scale) -- modified from table.fastcopy if old then local new = { } @@ -177,10 +177,8 @@ do setfield(h, 'shrink_order', 0) end for k,w in pairs(v.kern) do - local g = node_new(id_kern) + local g = node_copy(kern_skel) setfield(g, 'kern', w[1]) - setfield(g, 'subtype', 1) - set_attr(g, attr_icflag, FROM_JFM) v[k] = {false, g, w[2]/sz} end end @@ -249,7 +247,8 @@ do end -- EXT - function jfontdefX(g) + function jfontdefX(g, dir) + jfm_dir, is_def_jfont = dir, true local t = token.get_next() cstemp=token.csname_name(t) global_flag = g and '\\global' or '' @@ -260,9 +259,8 @@ do -- EXT local identifiers = fonts.hashes.identifiers - function jfontdefY(dir) - jfm_dir = dir - local j = load_jfont_metric(dir) + function jfontdefY() + local j = load_jfont_metric(jfm_dir) local fn = font.id(cstemp) local f = font_getfont(fn) if not j then @@ -290,7 +288,7 @@ do font_metric_table[fn]=fmtable tex.sprint(cat_lp, global_flag, '\\protected\\expandafter\\def\\csname ', cstemp , '\\endcsname{\\ltj@cur'.. - (dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}') + (jfm_dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}') end end @@ -353,6 +351,11 @@ do name = name .. 'jfmvar=' .. jfm_var end end + if jfm_dir == 'tate' then + if not name:match('vert') and not name:match('vrt2') then + name = name .. ';vert;vrt2' + end + end return name end @@ -360,9 +363,11 @@ do local otfl_fdr = fonts.definers.read local ltjr_font_callback = ltjr.font_callback function luatexja.font_callback(name, size, id) - local new_name = extract_metric(name) + local new_name = is_def_jfont and extract_metric(name) or name + is_def_jfont = false local res = ltjr_font_callback(new_name, size, id, otfl_fdr) luatexbase.call_callback('luatexja.define_font', res, new_name, size, id) + -- this callback processes variation selector, so we execute it always return res end luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end) @@ -624,7 +629,7 @@ do end return vw, tsb, vk end - + local sort = table.sort local function add_fl_table(dest, tg, unitable, glyphmax, asc_des, units) for i = 0, glyphmax-1 do @@ -649,7 +654,7 @@ do -- vertical metric local vw, tsb, vk = glyph_vmetric(gv) local gi = unitable[gv.name] - if vw and vw~=asc_des then + if gi and vw and vw~=asc_des then -- We do not use tsidebearing, since (1) fontloader does not read VORG table -- and (2) 'tsidebearing' doea not appear in the returned table by fontloader.fields. -- Hence, we assume that vertical origin == ascender @@ -658,13 +663,22 @@ do dest[gi].vwidth = vw/units end -- vertical kern - if vk then - dest = dest or {}; + if gi and vk then + dest = dest or {}; local dest_vk = dest.vkerns or {}; dest.vkerns = dest_vk for _,v in pairs(vk) do - dest_vk[v.lookup] = dest_vk[v.lookup] or {} - dest_vk[v.lookup][gi] = dest_vk[v.lookup][gi] or {} - dest_vk[v.lookup][gi][unitable[v.char]] = v.off + local vl = v.lookup + if type(vl)=='table' then + for _,vlt in pairs(vl) do + dest_vk[vlt] = dest_vk[vlt] or {} + dest_vk[vlt][gi] = dest_vk[vlt][gi] or {} + dest_vk[vlt][gi][unitable[v.char]] = v.off + end + else + dest_vk[vl] = dest_vk[vl] or {} + dest_vk[vl][gi] = dest_vk[vl][gi] or {} + dest_vk[vl][gi][unitable[v.char]] = v.off + end end end end @@ -684,7 +698,7 @@ do fl.ascent + fl.descent, fl.units_per_em) end end - fontloader.close(fl) + fontloader.close(fl); collectgarbage("collect") return dest end -- supply vkern table @@ -707,41 +721,41 @@ end -- 縦書き用字形への変換テーブル local prepare_vert_data do - local function add_feature_table(tname, src, dest) - for i,v in pairs(src) do - if type(v.slookups)=='table' then - local s = v.slookups[tname] - if s then - dest = dest or {} - dest[i] = dest[i] or {} - dest[i].vert = dest[i].vert or s - end - end - end - return dest - end - prepare_vert_data = function (dest, id) - local a = id.resources.sequences - 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 - dest= add_feature_table(v.subtables[1], s, dest) - end - end - end - return dest - end - -- 縦書き用字形への変換 - function get_vert_glyph(n, chr) - local fn = font_extra_info[n] - return (fn and fn[chr] and fn[chr].vert) or chr - end + -- local function add_feature_table(tname, src, dest) + -- for i,v in pairs(src) do + -- if type(v.slookups)=='table' then + -- local s = v.slookups[tname] + -- if s then + -- dest = dest or {} + -- dest[i] = dest[i] or {} + -- dest[i].vert = dest[i].vert or s + -- end + -- end + -- end + -- return dest + -- end + -- prepare_vert_data = function (dest, id) + -- local a = id.resources.sequences + -- 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 + -- dest= add_feature_table(v.subtables[1], s, dest) + -- end + -- end + -- end + -- return dest + -- end + -- -- 縦書き用字形への変換 + -- function get_vert_glyph(n, chr) + -- local fn = font_extra_info[n] + -- return (fn and fn[chr] and fn[chr].vert) or chr + -- end end --- +-- do - local cache_ver = 3 + local cache_ver = 6 local checksum = file.checksum local function prepare_extra_data_base(id) @@ -760,7 +774,6 @@ do font_extra_basename[bname] = dat[1] or {} else local dat = nil - dat = prepare_vert_data(dat, id) dat = prepare_fl_data(dat, id) font_extra_basename[bname] = dat or {} ltjb.save_cache( v, @@ -774,7 +787,7 @@ do end end local function prepare_extra_data_font(id, res) - if type(res)=='table' and res.shared then + if type(res)=='table' and res.shared then font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)] end end @@ -784,6 +797,7 @@ do -- these function is executed one time per one fontfile local bname = prepare_extra_data_base(tfmdata) if bname then supply_vkern_table(tfmdata, bname) end + return tfmdata end, 'ltj.prepare_extra_data', 1) luatexbase.add_to_callback( @@ -793,12 +807,12 @@ do end, 'ltj.prepare_extra_data', 1) - local function a (n, dat) font_extra_info[n] = dat end - ltjr.vert_addfunc = a + local nulltable = {} -- dummy + ltjr.vert_addfunc = function (n) font_extra_info[n] = nulltable end local identifiers = fonts.hashes.identifiers for i=1,font.nextid()-1 do - if identifiers[i] then + if identifiers[i] then prepare_extra_data_base(identifiers[i]) prepare_extra_data_font(i,identifiers[i]) end @@ -810,13 +824,19 @@ end -- calculate vadvance ------------------------------------------------------------------------ do - local function acc_feature(table_vadv, subtables, ft) + local function acc_feature(table_vadv, table_vorg, subtables, ft, already_vert) for char_num,v in pairs(ft.shared.rawdata.descriptions) do if v.slookups then for sn, sv in pairs(v.slookups) do - if subtables[sn] and type(sv)=='table' and sv[4]~=0 then - table_vadv[char_num] - = (table_vadv[char_num] or 0) + sv[4] + if subtables[sn] and type(sv)=='table' then + if sv[4]~=0 then + table_vadv[char_num] + = (table_vadv[char_num] or 0) + sv[4] + end + if sv[2]~=0 and not already_vert then + table_vorg[char_num] + = (table_vorg[char_num] or 0) + sv[2] + end end end end @@ -824,14 +844,15 @@ do end luatexbase.add_to_callback( - "luatexja.define_jfont", + "luatexja.define_jfont", function (fmtable, fnum) local vadv = {}; fmtable.v_advance = vadv + local vorg = {}; fmtable.v_origin = vorg local ft = font_getfont(fnum) local subtables = {} if ft.specification then for feat_name,v in pairs(ft.specification.features.normal) do - if v then + if v==true then for _,i in pairs(ft.resources.sequences) do if i.order[1]== feat_name and i.type == 'gpos_single' then for _,st in pairs(i.subtables) do @@ -841,12 +862,16 @@ luatexbase.add_to_callback( end end end - acc_feature(vadv, subtables, ft) + acc_feature(vadv, vorg, subtables, ft, + ft.specification.features.normal.vrt2 or ft.specification.features.normal.vert) for i,v in pairs(vadv) do vadv[i]=vadv[i]/ft.units_per_em*fmtable.size end + for i,v in pairs(vorg) do + vorg[i]=vorg[i]/ft.units_per_em*fmtable.size + end end - return fmtable + return fmtable end, 1, 'ltj.v_advance' ) end @@ -856,7 +881,7 @@ end do local get_dir_count = ltjd.get_dir_count local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct - local tex_set_attr = tex.setattribute + local ensure_tex_attr = ltjb.ensure_tex_attr local font = font -- EXT: italic correction function append_italic() @@ -875,13 +900,12 @@ do if h then setfield(g, 'kern', h.characters[getchar(p)].italic) else - tex_set_attr(attr_icflag, 0) + ensure_tex_attr(attr_icflag, 0) return node_free(g) end end node_write(g) - tex_set_attr(attr_icflag, 0) + ensure_tex_attr(attr_icflag, 0) end end end -