X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=62b0e329c3a38bd1ec9dbd55e9f9ad870901818a;hb=43b3b49da87473dc407934da9fd9c652b938ba54;hp=aa92cebb151e5e36772c2b7c4deb5746ba14a355;hpb=bcdd1199d689c06bf177c0a5b886c21a664558b7;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index aa92ceb..62b0e32 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfont',
-  date = '2014/10/03',
+  date = '2015/05/03',
   description = 'Loader for Japanese fonts',
 })
 module('luatexja.jfont', package.seeall)
@@ -18,8 +18,6 @@ local Dnode = node.direct or node
 
 local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
 local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
-local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
 
 local nullfunc = function(n) return n end
 local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
@@ -28,7 +26,6 @@ local node_new = Dnode.new
 local node_free = Dnode.free
 local has_attr = Dnode.has_attribute
 local set_attr = Dnode.set_attribute
-local node_write = Dnode.write
 local round = tex.round
 local font_getfont = font.getfont
 
@@ -40,9 +37,8 @@ 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       = luatexja.icflag_table.ITALIC
 local FROM_JFM     = luatexja.icflag_table.FROM_JFM
-
+local tokenlib = luatexja.token
 ------------------------------------------------------------------------
 -- LOADING JFM
 ------------------------------------------------------------------------
@@ -54,7 +50,7 @@ luatexbase.create_callback("luatexja.load_jfm", "data", function (ft, jn) return
 
 local jfm_file_name, jfm_var
 local defjfm_res
-local jfm_dir, is_def_jfont
+local jfm_dir, is_def_jfont, is_vert_enabled
 
 function define_jfm(t)
    local real_char -- Does current character class have the 'real' character?
@@ -136,11 +132,6 @@ 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 = { }
@@ -159,6 +150,7 @@ do
 
    update_jfm_cache = function (j,sz)
       if metrics[j].size_cache[sz] then return end
+      --local TEMP = node_new(id_kern)
       local t = {}
       metrics[j].size_cache[sz] = t
       t.chars = metrics[j].chars
@@ -177,8 +169,10 @@ do
 	       setfield(h, 'shrink_order', 0)
 	    end
 	    for k,w in pairs(v.kern) do
-	       local g = node_copy(kern_skel)
+	       local g = node_new(id_kern)
 	       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
@@ -189,6 +183,7 @@ do
       t.zw = round(metrics[j].zw*sz)
       t.zh = round(metrics[j].zh*sz)
       t.size = sz
+      --node_free(TEMP)
    end
 end
 
@@ -247,12 +242,14 @@ do
    end
 
 -- EXT
-   function jfontdefX(g, dir)
+   local utf8 = unicode.utf8
+   function jfontdefX(g, dir, csname)
       jfm_dir, is_def_jfont = dir, true
-      local t = token.get_next()
-      cstemp=token.csname_name(t)
+      cstemp = csname:sub( (utf8.byte(csname,1,1) == tex.escapechar) and 2 or 1, -1)
+      cstemp = cstemp:sub(1, ((cstemp:sub(-1,-1)==' ') and (cstemp:len()>=2)) and -2 or -1)
       global_flag = g and '\\global' or ''
-      tex.sprint(cat_lp, '\\expandafter\\font\\csname ', cstemp, '\\endcsname')
+      tex.sprint(cat_lp, '\\expandafter\\font\\csname ', 
+		 (cstemp==' ') and '\\space' or cstemp, '\\endcsname')
    end
 
    luatexbase.create_callback("luatexja.define_jfont", "data", function (ft, fn) return ft end)
@@ -268,7 +265,8 @@ do
 			    "bad JFM `" .. jfm_file_name .. "'",
 			    'The JFM file you specified is not valid JFM file.\n'..
 			       'So defining Japanese font is cancelled.')
-	 tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', cstemp,
+	 tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', 
+		    (cstemp==' ') and '\\space' or cstemp,
 		       '\\endcsname=\\relax')
 	 return
       end
@@ -282,12 +280,13 @@ do
 			chars = sz.chars, char_type = sz.char_type,
 			kanjiskip = sz.kanjiskip, xkanjiskip = sz.xkanjiskip,
                         chars_cbcache = {},
+			vert_activated = is_vert_enabled,
       }
 
       fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn)
       font_metric_table[fn]=fmtable
       tex.sprint(cat_lp, global_flag, '\\protected\\expandafter\\def\\csname ',
-		    cstemp , '\\endcsname{\\ltj@cur'..
+		    (cstemp==' ') and '\\space' or cstemp, '\\endcsname{\\ltj@cur'..
 		    (jfm_dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}')
    end
 end
@@ -352,9 +351,12 @@ do
 	 end
       end
       if jfm_dir == 'tate' then
+	 is_vert_enabled = (not name:match('-vert')) and (not  name:match('-vrt2'))
          if not name:match('vert') and not name:match('vrt2') then
             name = name .. ';vert;vrt2'
          end
+      else
+	 is_vert_enabled = nil
       end
       return name
    end
@@ -379,7 +381,8 @@ end
 ------------------------------------------------------------------------
 do
    -- these function are called from ltj-latex.sty
-   local kyenc_list, ktenc_list = {}, {}
+   local fenc_list, kyenc_list, ktenc_list = {}, {}, {}
+   function add_fenc_list(enc) fenc_list[enc] = 'true ' end
    function add_kyenc_list(enc) kyenc_list[enc] = 'true ' end
    function add_ktenc_list(enc) ktenc_list[enc] = 'true ' end
    function is_kyenc(enc)
@@ -394,36 +397,57 @@ do
    end
 
    local kfam_list, Nkfam_list = {}, {}
-   function add_kfam_list(enc, fam)
-      if not kfam_list[enc] then kfam_list[enc] = {} end
-      kfam_list[enc][fam] = 'true '
-   end
-   function add_Nkfam_list(enc, fam)
-      if not Nkfam_list[enc] then Nkfam_list[enc] = {} end
-      Nkfam_list[enc][fam] = 'true '
+   function add_kfam(fam)
+      kfam_list[fam]=true
+   end
+   function search_kfam(fam, use_fd)
+      if kfam_list[fam] then 
+	 tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+      elseif Nkfam_list[fam] then 
+	 tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      elseif use_fd then
+	 for i,_ in pairs(kyenc_list) do
+	    if kpse.find_file(string.lower(i)..fam..'.fd') then
+	       tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+	    end
+	 end
+	 for i,_ in pairs(ktenc_list) do
+	    if kpse.find_file(string.lower(i)..fam..'.fd') then
+	       tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+	    end
+	 end
+	 Nkfam_list[fam]=true; tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      else
+	 tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      end
    end
-   function is_kfam(enc, fam)
-      tex.sprint(cat_lp, '\\let\\ifin@\\if'
-		 .. (kfam_list[enc] and kfam_list[enc][fam] or 'false ')) end
-   function is_Nkfam(enc, fam)
-      tex.sprint(cat_lp, '\\let\\ifin@\\if'
-		 .. (Nkfam_list[enc] and Nkfam_list[enc][fam] or 'false ')) end
-
    local ffam_list, Nffam_list = {}, {}
-   function add_ffam_list(enc, fam)
-      if not ffam_list[enc] then ffam_list[enc] = {} end
-      ffam_list[enc][fam] = 'true '
-   end
-   function add_Nffam_list(enc, fam)
-      if not Nffam_list[enc] then Nffam_list[enc] = {} end
-      Nffam_list[enc][fam] = 'true '
+   function is_ffam(fam)
+      tex.sprint(cat_lp, '\\let\\ifin@\\if' .. (ffam_list[fam] or 'false '))
+   end
+   function add_ffam(fam)
+      ffam_list[fam]='true '
+   end
+   function search_ffam_declared()
+     local s = ''
+     for i,_ in pairs(fenc_list) do
+	s = s .. '\\cdp@elt{' .. i .. '}'
+     end
+     tex.sprint(cat_lp, s)
+   end
+   function search_ffam_fd(fam)
+      if Nffam_list[fam] then 
+	 tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      else
+	 for i,_ in pairs(fenc_list) do
+	    if kpse.find_file(string.lower(i)..fam..'.fd') then
+	       tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+	    end
+	 end
+	 Nffam_list[fam]=true; tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      end
    end
-   function is_ffam(enc, fam)
-      tex.sprint(cat_lp, '\\let\\ifin@\\if'
-		 .. (ffam_list[enc] and ffam_list[enc][fam] or 'false ')) end
-   function is_Nffam(enc, fam)
-      tex.sprint(cat_lp, '\\let\\ifin@\\if'
-		 .. (Nffam_list[enc] and Nffam_list[enc][fam] or 'false ')) end
+
 end
 ------------------------------------------------------------------------
 -- ALTERNATE FONTS
@@ -606,6 +630,28 @@ do
    end
 
 end
+------------------------------------------------------------------------
+-- 終了時に各種ノードを破棄
+------------------------------------------------------------------------
+do
+   function cleanup_size_cache()
+      --local gs, ke = 0, 0
+      for _,n in pairs(metrics) do
+	 for i,t in pairs(n.size_cache) do
+	    for _,v in pairs(t.char_type) do
+	       for k,w in pairs(v) do
+		  if type(k)=='number' then
+		     --if w[1] then gs = gs + 1 else ke = ke + 1 end
+		     node_free(w[2])
+		  end
+	       end
+	    end
+	    n.size_cache[i]=nil
+	 end
+      end
+      --print('glue spec: ', gs, 'kern: ', ke)
+   end
+end
 
 ------------------------------------------------------------------------
 -- 追加のフォント情報
@@ -631,8 +677,9 @@ do
    end
 
    local sort = table.sort
-   local function add_fl_table(dest, tg, unitable, glyphmax, asc_des, units)
-      for i = 0, glyphmax-1 do
+   local function add_fl_table(dest, glyphs, unitable, asc_des, units)
+      local tg, glyphmin, glyphmax = glyphs.glyphs, glyphs.glyphmin or 0, glyphs.glyphmax
+      for i = glyphmin, glyphmax-1 do
 	 local gv = tg[i]
 	 if gv then
 	    if gv.altuni then
@@ -667,17 +714,19 @@ do
 	       dest = dest or {};
 	       local dest_vk = dest.vkerns or {}; dest.vkerns = dest_vk
 	       for _,v in pairs(vk) do
-		  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
+		  if unitable[v.char] then
+		     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
-		  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
@@ -689,12 +738,12 @@ do
       local fl = fontloader.open(id.filename)
       local unicodes = id.resources.unicodes
       if fl.glyphs then
-	 dest = add_fl_table(dest, fl.glyphs, id.resources.unicodes, fl.glyphmax,
+	 dest = add_fl_table(dest, fl, unicodes,
 			     fl.ascent + fl.descent, fl.units_per_em)
       end
       if fl.subfonts then
          for _,v in pairs(fl.subfonts) do
-            dest = add_fl_table(dest, v.glyphs, id.resources.unicodes, v.glyphmax,
+            dest = add_fl_table(dest, v, unicodes, 
 				fl.ascent + fl.descent, fl.units_per_em)
          end
       end
@@ -718,41 +767,6 @@ do
    end
 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
-end
-
 --
 do
    local cache_ver = 6
@@ -875,37 +889,84 @@ luatexbase.add_to_callback(
    end, 1, 'ltj.v_advance'
 )
 end
+
+------------------------------------------------------------------------
+-- supply tounicode entries
+------------------------------------------------------------------------
+do
+  local ltjr_prepare_cid_font = ltjr.prepare_cid_font
+  luatexbase.add_to_callback(
+     'luaotfload.patch_font',
+     function (tfmdata)
+	if tfmdata.cidinfo then
+	   local rd = ltjr_prepare_cid_font(tfmdata.cidinfo.registry, tfmdata.cidinfo.ordering)
+	   if rd then
+	      local ru, rc = rd.resources.unicodes, rd.characters
+	      for i,v in pairs(tfmdata.characters) do
+		 local w = ru["Japan1." .. tostring(v.index)]
+		 if w then
+		    v.tounicode = v.tounicode or rc[w]. tounicode
+		 end
+	      end
+	   end
+	end
+
+	return tfmdata
+     end,
+     'ltj.supply_tounicode', 1)  
+end
+
+
 ------------------------------------------------------------------------
 -- MISC
 ------------------------------------------------------------------------
 do
+   local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
+   local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
    local get_dir_count = ltjd.get_dir_count
    local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
    local ensure_tex_attr = ltjb.ensure_tex_attr
+   local node_write = Dnode.write
    local font = font
+   local ITALIC       = luatexja.icflag_table.ITALIC
    -- EXT: italic correction
    function append_italic()
       local p = to_direct(tex.nest[tex.nest.ptr].tail)
+      local TEMP = node_new(id_kern)
       if p and getid(p)==id_glyph then
-	 local f = getfont(p)
-	 local g = node_new(id_kern)
-	 setfield(g, 'subtype', 1)
-	 set_attr(g, attr_icflag, ITALIC)
 	 if is_ucs_in_japanese_char(p) then
-	    f = has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)
-	    local j = font_metric_table[f]
+	    local j = font_metric_table[
+	       has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)
+	       ]
+	    local g = node_new(id_kern)
+	    setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC)
 	    setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic)
+	    node_write(g); ensure_tex_attr(attr_icflag, 0)
 	 else
+	    local f = getfont(p)
 	    local h = font_getfont(f) or font.fonts[f]
 	    if h then
+	       local g = node_new(id_kern)
+	       setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC)
 	       setfield(g, 'kern', h.characters[getchar(p)].italic)
-	    else
-	       ensure_tex_attr(attr_icflag, 0)
-	       return node_free(g)
+	       node_write(g); ensure_tex_attr(attr_icflag, 0)
 	    end
 	 end
-	 node_write(g)
-	 ensure_tex_attr(attr_icflag, 0)
       end
+      node_free(TEMP)
    end
 end
+
+------------------------------------------------------------------------
+-- VERT VARIANT TABLE
+------------------------------------------------------------------------
+vert_form_table = {
+   [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30,
+   [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38,
+   [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C,
+   [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40,
+   [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44,
+   [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33,
+}
+setmetatable(vert_form_table, {__index=function(t,k) return k end});
+