X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-otf.lua;h=0e542102270222df272c6de50572152d0e55960b;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=e36a197c3f13856da12f5b39ed2ca10c2459504b;hpb=8d3a3cb37f1d0aeb05dc09a4ebf23b10de20d6fd;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua
index e36a197..0e54210 100644
--- a/src/ltj-otf.lua
+++ b/src/ltj-otf.lua
@@ -1,67 +1,130 @@
 --
--- luatexja/otf.lua
+-- luatexja/ltj-otf.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.otf',
-  date = '2013/05/11',
-  description = 'The OTF Lua module for LuaTeX-ja',
-})
-
 require('unicode')
 require('lualibs')
 
-
 luatexja.load_module('base');      local ltjb = luatexja.base
 luatexja.load_module('jfont');     local ltjf = luatexja.jfont
 luatexja.load_module('rmlgbm');    local ltjr = luatexja.rmlgbm
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
+luatexja.load_module('direction'); local ltjd = luatexja.direction
+luatexja.load_module('stack');     local ltjs = luatexja.stack
 
 local id_glyph = node.id('glyph')
 local id_whatsit = node.id('whatsit')
 local sid_user = node.subtype('user_defined')
 
-local node_new = node.new
-local node_remove = node.remove
-local node_next = node.next
-local node_free = node.free
-local has_attr = node.has_attribute
-local set_attr = node.set_attribute
-local unset_attr = node.unset_attribute
-local node_insert_after = node.insert_after
-local identifiers = fonts.hashes.identifiers
+local setfield = node.direct.setfield
+local getfield = node.direct.getfield
+local getid = node.direct.getid
+local getfont = node.direct.getfont
+local getchar = node.direct.getchar
+local getsubtype = node.direct.getsubtype
+
+local to_node = node.direct.tonode
+local to_direct = node.direct.todirect
+
+local node_new = node.direct.new
+local node_remove = node.direct.remove
+local node_next = node.direct.getnext
+local node_free = node.direct.free
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
+local unset_attr = node.direct.unset_attribute
+local node_insert_after = node.direct.insert_after
+local node_write = node.direct.write
+local node_traverse_id = node.direct.traverse_id
+
 
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
-local attr_jchar_class = luatexbase.attributes['ltj@charclass']
+local attr_curtfnt = luatexbase.attributes['ltj@curtfnt']
 local attr_yablshift = luatexbase.attributes['ltj@yablshift']
 local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
+local attr_tablshift = luatexbase.attributes['ltj@tablshift']
+local attr_tkblshift = luatexbase.attributes['ltj@tkblshift']
+local lang_ja = luatexja.lang_ja
+local identifiers = fonts.hashes.identifiers
 
 local ltjf_font_metric_table = ltjf.font_metric_table
+local ltjf_font_extra_info = ltjf.font_extra_info
 local ltjf_find_char_class = ltjf.find_char_class
 local ltjr_cidfont_data = ltjr.cidfont_data
 local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char
+local ltjd_get_dir_count = ltjd.get_dir_count
+local dir_tate = luatexja.dir_table.dir_tate
 
+luatexja.userid_table.OTF = luatexbase.newuserwhatsitid('char_by_cid',  'luatexja')
 local OTF = luatexja.userid_table.OTF
+local tex_get_attr = tex.getattribute
+
+local cache_var = 2
+local cache_outdate_fn = function (t) return t.version~=cache_ver end
+local ivd_aj1 = ltjb.load_cache('ltj-ivd_aj1',cache_outdate_fn)
+if not ivd_aj1 then -- make cache
+   ivd_aj1 = require('ltj-ivd_aj1.lua')
+   ltjb.save_cache_luc('ltj-ivd_aj1', ivd_aj1)
+end
+
 
 local function get_ucs_from_rmlgbm(c)
-   local v = ltjr_cidfont_data["Adobe-Japan1"].resources.unicodes["Japan1." .. tostring(c)]
-   if not v then -- AJ1 範囲外
-      return 0
+   local v = (ivd_aj1 and ivd_aj1.table_ivd_aj1[c]
+      or ltjr_cidfont_data["Adobe-Japan1"].resources.unicodes["Japan1." .. tostring(c)])
+      or 0
+   if v>=0x200000 then -- table
+      local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate)
+                                        and attr_curtfnt or attr_curjfnt)
+      local curjfnt = identifiers[curjfnt_num].resources
+      local base, ivs = v % 0x200000, 0xE00FF + math.floor(v/0x200000)
+      curjfnt = curjfnt and curjfnt.variants
+      curjfnt = curjfnt and curjfnt[ivs]
+      return curjfnt and curjfnt[base] or base
    elseif v<0xF0000 then -- 素直に Unicode にマップ可能
       return v
-   else
-      local w = ltjr_cidfont_data["Adobe-Japan1"].characters[v]. tounicode
-      -- must be non-nil!
-      local i = string.len(w)
-      if i==4 then -- UCS2
-         return tonumber(w,16)
-      elseif i==8 then 
-         i,w = tonumber(string.sub(w,1,4),16), tonumber(string.sub(w,-4),16)
-         if (w>=0xD800) and (w<=0xDB7F) and (i>=0xDC00) and (i<=0xDFFF) then -- Surrogate pair
-            return (w-0xD800)*0x400 + (i-0xDC00)
-         else
-            return 0
+   else -- privete use area
+      local r, aj = nil, ltjr_cidfont_data["Adobe-Japan1"] 
+      -- 先に ltj_vert_table を見る
+      for i,w in pairs(aj.shared.ltj_vert_table) do
+         if w==v then r=i; break end
+      end
+      if not r then
+         -- なければ ToUnicode から引く
+         local w = aj.characters[v].tounicode -- must be non-nil!
+         local i = string.len(w)
+         if i==4 then -- UCS2
+            r = tonumber(w,16)
+         elseif i==8 then
+            i,w = tonumber(string.sub(w,1,4),16), tonumber(string.sub(w,-4),16)
+            if (w>=0xD800) and (w<=0xDB7F) and (i>=0xDC00) and (i<=0xDFFF) then -- Surrogate pair
+               r = (w-0xD800)*0x400 + (i-0xDC00)
+            else
+               r = 0
+            end
+         end
+      end
+      if aj.shared.ltj_vert_table[r] then
+         -- CID が縦組用字形だった場合
+         local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate)
+                                        and attr_curtfnt or attr_curjfnt)
+         local t = identifiers[curjfnt_num]
+         if t.resources.sequences then
+            for _,i in pairs(t.resources.sequences) do
+               if (i.order[1]=='vert' or i.order[1]=='vrt2')
+                  and i.type == 'gsub_single' and i.steps then
+                  for _,j in pairs(i.steps) do
+                     if type(j)=='table' then 
+                        if type(j.coverage)=='table' then
+                           for i,k in pairs(j.coverage) do
+                              if i==r then return k end
+                           end
+                        end
+                     end
+                  end
+               end
+            end
          end
       end
+      return r
    end
 end
 
@@ -69,101 +132,139 @@ end
 -- This whatsit node will be extracted to a glyph_node
 local function append_jglyph(char)
    local p = node_new(id_whatsit,sid_user)
-   local v = tex.attribute[attr_curjfnt]
-   p.user_id=OTF; p.type=100; p.value=char
-   set_attr(p, attr_yablshift, tex.attribute[attr_ykblshift])
-   node.write(p)
+   setfield(p, 'user_id', OTF)
+   setfield(p, 'type', 100)
+   setfield(p, 'value', char)
+   node_write(p)
 end
 
-local function cid(key)
-   if key==0 then return append_jglyph(char) end
-   local curjfnt = identifiers[tex.attribute[attr_curjfnt]]
-   if not curjfnt.cidinfo or 
-      curjfnt.cidinfo.ordering ~= "Japan1" and
-      curjfnt.cidinfo.ordering ~= "GB1" and
-      curjfnt.cidinfo.ordering ~= "CNS1" and
-      curjfnt.cidinfo.ordering ~= "Korea1" then
---      ltjb.package_warning('luatexja-otf',
---			   'Current Japanese font (or other CJK font) "'
---			      ..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1 etc.)')
-      return append_jglyph(get_ucs_from_rmlgbm(key))
+local utf
+do
+   utf = function (ucs)
+      local char = ucs
+      if ltjd_get_dir_count()==dir_tate then
+         local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate)
+                                        and attr_curtfnt or attr_curjfnt)
+         local t = identifiers[curjfnt_num]
+         if t.resources.sequences then
+            for _,i in pairs(t.resources.sequences) do
+               if (i.order[1]=='vert' or i.order[1]=='vrt2')
+                  and i.type == 'gsub_single' and i.steps then
+                  for _,j in pairs(i.steps) do
+                     if type(j)=='table' then 
+                        if type(j.coverage)=='table' then
+                           for i,k in pairs(j.coverage) do
+                              if i==char then return append_jglyph(k) end
+                           end
+                        end
+                     end
+                  end
+               end
+            end
+         end
+      end
+      return append_jglyph(char)
    end
-   local char = curjfnt.resources.unicodes[curjfnt.cidinfo.ordering..'.'..tostring(key)]
-   if not char then
-      ltjb.package_warning('luatexja-otf',
-                           'Current Japanese font (or other CJK font) "'
-                              ..curjfnt.psname..'" does not have the specified CID character ('
-                              ..tostring(key)..')', 
-                           'Use a font including the specified CID character.')
-      char = 0
+end
+
+local cid
+do
+   cid = function (key)
+      if key==0 then return append_jglyph(0) end
+      local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate)
+                                        and attr_curtfnt or attr_curjfnt)
+      local curjfnt = identifiers[curjfnt_num]
+      local cidinfo = curjfnt.resources.cidinfo
+      if not cidinfo or
+         cidinfo.ordering ~= "Japan1" and
+         cidinfo.ordering ~= "GB1" and
+         cidinfo.ordering ~= "CNS1" and
+         cidinfo.ordering ~= "Korea1" and
+         cidinfo.ordering ~= "KR" then
+         --      ltjb.package_warning('luatexja-otf',
+         --			   'Current Japanese font (or other CJK font) "'
+         --			      ..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1 etc.)')
+            return append_jglyph(get_ucs_from_rmlgbm(key))
+      else
+	 local char = ltjf_font_extra_info[curjfnt_num].ind_to_uni[key]
+	 if not char then
+--	    ltjb.package_warning('luatexja-otf',
+--               '"' ..curjfnt.psname..'" does not have CID character '
+--		  ..tostring(key),
+--	       'Use a font including the specified CID character.')
+         char = 0
+	 end
+	 return append_jglyph(char)
+      end
    end
-   return append_jglyph(char)
 end
 
 local function extract(head)
+   head = to_direct(head)
    local p = head
-   local v
+   local is_dir_tate = ltjs.list_dir == dir_tate
+   local attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift
+   local attr_kblshift = is_dir_tate and attr_tkblshift or attr_ykblshift
+   local attr_curfnt =   is_dir_tate and attr_curtfnt or attr_curjfnt
    while p do
-      if p.id==id_whatsit then
-	 if p.subtype==sid_user and p.user_id==OTF then
-	    local g = node_new(id_glyph)
-	    g.subtype = 0; g.char = p.value
-	    v = has_attr(p, attr_curjfnt); g.font = v
-	    set_attr(g, attr_curjfnt, v)
-	    v = has_attr(p, attr_yablshift)
-	    if v then 
-	       set_attr(g, attr_yablshift, v)
-	    else
-	       unset_attr(g, attr_yablshift)
-	    end
-	    head = node_insert_after(head, p, g)
-	    head = node_remove(head, p)
-	    node_free(p); p = g
-	 end
+      if getid(p)==id_whatsit then
+         if getsubtype(p)==sid_user then
+            local puid = getfield(p, 'user_id')
+            if puid==OTF then
+            --if puid==OTF or puid==VSR then
+               local g = node_new(id_glyph)
+               setfield(g, 'subtype', 0)
+	       setfield(g, 'char', getfield(p, 'value'))
+               local v = has_attr(p, attr_curfnt); setfield(g, 'font',v)
+               --if puid==OTF then
+                  setfield(g, 'lang', lang_ja)
+                  set_attr(g, attr_kblshift, has_attr(p, attr_kblshift))
+               --else
+               --   set_attr(g, attr_ablshift, has_attr(p, attr_ablshift))
+               --end
+               head = node_insert_after(head, p, g)
+               head = node_remove(head, p)
+               node_free(p); p = g
+            end
+         end
       end
       p = node_next(p)
    end
-   return head
+   return to_node(head)
 end
 
-luatexbase.add_to_callback('hpack_filter', 
-   function (head) return extract(head) end,'ltj.hpack_filter_otf',
-   luatexbase.priority_in_callback('pre_linebreak_filter',
-				   'ltj.pre_linebreak_filter'))
-luatexbase.add_to_callback('pre_linebreak_filter', 
-   function (head) return extract(head) end, 'ltj.pre_linebreak_filter_otf',
-   luatexbase.priority_in_callback('pre_linebreak_filter',
-				   'ltj.pre_linebreak_filter'))
-
-
+ltjb.add_to_callback('hpack_filter', extract,'ltj.otf',
+  luatexbase.priority_in_callback('hpack_filter', 'ltj.main'))
+ltjb.add_to_callback('pre_linebreak_filter', extract,'ltj.otf',
+  luatexbase.priority_in_callback('pre_linebreak_filter', 'ltj.main'))
 -- additional callbacks
 -- 以下は，LuaTeX-ja に用意された callback のサンプルになっている．
 --   JFM の文字クラスの指定の所で，"AJ1-xxx" 形式での指定を可能とした．
---   これらの文字指定は，和文フォント定義ごとに，それぞれのフォントの
---   CID <-> グリフ 対応状況による変換テーブルが用意される．
 
--- 和文フォント読み込み時に，CID -> unicode 対応をとっておく．
-local function cid_to_char(fmtable, fn)
+-- 和文フォント読み込み時に，ind -> unicode 対応をとっておく．
+local function ind_to_uni(fmtable, fn)
    local fi = identifiers[fn]
-   if fi.cidinfo and fi.cidinfo.ordering == "Japan1" then
-      fmtable.cid_char_type = {}
+   local t = ltjf_font_extra_info[fn].ind_to_uni
+   if t and fi.resources and fi.resources.cidinfo 
+      and fi.resources.cidinfo.ordering == "Japan1" then
       for i, v in pairs(fmtable.chars) do
 	 local j = string.match(i, "^AJ1%-([0-9]*)")
 	 if j then
-	    j = tonumber(fi.resources.unicodes['Japan1.'..tostring(j)])
+	    j = t[i]
 	    if j then
-	       fmtable.cid_char_type[j] = v 
+	       fmtable.cid_char_type = fmtable.cid_char_type  or {}
+	       fmtable.cid_char_type[j] = v
 	    end
 	 end
       end
    end
    return fmtable
 end
-luatexbase.add_to_callback("luatexja.define_jfont", 
-			   cid_to_char, "ltj.otf.define_jfont", 1)
+luatexbase.add_to_callback("luatexja.define_jfont",
+			   ind_to_uni, "ltj.otf.define_jfont", 1)
 --  既に読み込まれているフォントに対しても，同じことをやらないといけない
 for fn, v in pairs(ltjf_font_metric_table) do
-   ltjf_font_metric_table[fn] = cid_to_char(v, fn)
+   ltjf_font_metric_table[fn] = ind_to_uni(v, fn)
 end
 
 
@@ -174,190 +275,22 @@ local function cid_set_char_class(arg, fmtable, char)
    else return 0
    end
 end
-luatexbase.add_to_callback("luatexja.find_char_class", 
+luatexbase.add_to_callback("luatexja.find_char_class",
 			   cid_set_char_class, "ltj.otf.find_char_class", 1)
 
--------------------- IVS
-local font_ivs_table = {} -- key: fontnumber
-local enable_ivs
-do
-   local sort = table.sort
-   local uniq_flag
-   local function add_ivs_table(tg, unitable)
-      for gu, gv in pairs(tg) do
-         local ga = gv.altuni
-         if ga then
-	    for _,at in pairs(ga) do
-	       local bu, vs = at.unicode, (at.variant or 0)-0xE0100
-	       if vs>=0 and vs<0xF0 then
-	          if not ivs[bu] then ivs[bu] = {} end
-	          uniq_flag = true
-                  for i,_ in pairs(ivs[bu]) do
-                     if i==vs then uniq_flag = false; break end
-                  end
-	          if uniq_flag then 
-                     ivs[bu][vs] = unitable[gv.name]
-                  end
-	       end
-	    end
-         end
-      end
-   end
-   local function make_ivs_table(id, fname)
-      ivs = {}
-      local fl = fontloader.open(fname)
-      local ft = fontloader.to_table(fl)
-      local unicodes = id.resources.unicodes
-      add_ivs_table(ft.glyphs, id.resources.unicodes)
-      if ft.subfonts then
-         for _,v in pairs(ft.subfonts) do
-            add_ivs_table(v.glyphs, id.resources.unicodes)
-         end
-      end
-      fontloader.close(fl)
-      return ivs
-   end
-
--- loading and saving
-   local font_ivs_basename = {} -- key: basename
-   local path           = {
-      localdir  = kpse.expand_var("$TEXMFVAR"),
-      systemdir = kpse.expand_var("$TEXMFSYSVAR"),
-   }
-   local cache_dir = '/luatexja'
-   local checksum = file.checksum
-
-   local function ivs_cache_save(id, fname)
-      local savepath  = path.localdir .. cache_dir
-      if not lfs.isdir(savepath) then dir.mkdirs(savepath) end
-      savepath = file.join(savepath, "ivs_" .. string.lower(file.nameonly(fname)) .. ".lua")
-      local result = make_ivs_table(id, fname)
-      if file.iswritable(savepath) then
-         table.tofile(savepath, { checksum(fname), result },
-           'return', false, true, false )
-         --ltjb.package_info_no_line('luatexja', "saved :'" .. savepath .. "'", '')
-         print("saved :'" .. savepath .. "'", '')
-      else 
-         --ltjb.package_warning_no_line('luatexja', "failed to save to '" .. savepath .. "'", '')
-         print("failed to save to '" .. savepath .. "'", '')
-      end
-      return result
-   end
-
-   local function ivs_cache_load(cname, id, fname)
-      local result = require(cname)
-      local newsum = checksum(fname)
-      if newsum~=result[1] then
-         return ivs_cache_save(id, fname)
-      else
-         return result[2]
-      end
-   end
-
-   local function prepare_ivs_data(n, id)
-      -- test if already loaded
-      if type(id)=='number' then 
-         font_ivs_table[n] = font_ivs_table[id]; return 
-      end
-      local fname = id.filename
-      local bname = file.basename(fname)
-      if not fname then 
-         font_ivs_table[n] = {}; return
-      elseif font_ivs_basename[bname] then 
-         font_ivs_table[n] = font_ivs_basename[bname]; return
-      end
-      
-      -- if cache is present; read them
-      local v = "ivs_" .. string.lower(file.nameonly(fname)) .. ".lua"
-      local localpath  = file.join(path.localdir, cache_dir, v)
-      local systempath = file.join(path.systemdir, cache_dir , v)
-      local kpsefound  = kpse.find_file(v)
-      if kpsefound and file.isreadable(kpsefound) then
-         font_ivs_basename[bname] = ivs_cache_load(kpsefound, id, fname)
-      elseif file.isreadable(localpath)  then
-         font_ivs_basename[bname] = ivs_cache_load(localpath, id, fname)
-      elseif file.isreadable(systempath) then
-         font_ivs_basename[bname] = ivs_cache_load(systempath, id, fname)
-      else
-         font_ivs_basename[bname] = ivs_cache_save(id, fname)
-      end
-      if not font_ivs_basename[bname] then font_ivs_basename[bname] = {} end
-      font_ivs_table[n] = font_ivs_basename[bname]
-   end
-   local ivs = {}
-   ivs.font_ivs_table = font_ivs_table
-   luatexja.ivs = ivs
-
--- 組版時
-   local function ivs_jglyph(char, bp, pf)
-      local p = node_new(id_whatsit,sid_user)
-      p.user_id=OTF; p.type=100; p.value=char
-      set_attr(p, attr_curjfnt, pf)
-      set_attr(p, attr_yablshift, has_attr(bp, attr_ykblshift) or 0)
-      return p
-   end
-
-   local function do_ivs_repr(head)
-      local p = head
-      while p do
-	 local pid = p.id
-	 if pid==id_glyph then
-            local pf = p.font
-            if (has_attr(p, attr_curjfnt) or 0) == pf  then
-               -- only works with JAchars
-               local pt = font_ivs_table[pf]
-               local q = node_next(p) -- the next node of p
-               if q and q.id==id_glyph then
-                  local qc = q.char
-                  if qc>=0xE0100 and qc<0xE01F0 then -- q is an IVS selector
-                     pt = pt and pt[p.char];  pt = pt and  pt[qc-0xE0100]
-                     head = node_remove(head,q)
-                     if pt then
-                        local np = ivs_jglyph(pt, p, pf)
-                        head = node_insert_after(head, p, np) 
-                        head = node_remove(head,p)
-                        p = np
-                     end
-                  end
-               end
-            end
-         end
-	 p = node_next(p)
-      end
-      return head
-   end
-
-   -- font define
-   local function font_callback(name, size, id, fallback)
-      local d = fallback(name, size, id)
-      prepare_ivs_data(id, d)
-      return d
-   end
-
-   enable_ivs = function ()
-      luatexbase.add_to_callback('hpack_filter', 
-				 function (head) return do_ivs_repr(head) end,'do_ivs', 1)
-      luatexbase.add_to_callback('pre_linebreak_filter', 
-				 function (head) return do_ivs_repr(head) end, 'do_ivs', 1)
-      local ivs_callback = function (name, size, id)
-         return font_callback(
-            name, size, id, 
-            function (name, size, id) return luatexja.font_callback(name, size, id) end
-         )
-      end
-      luatexbase.add_to_callback('define_font',ivs_callback,"luatexja.ivs_font_callback", 1)
-      for i=1,font.nextid()-1 do
-         if identifiers[i] then prepare_ivs_data(i, identifiers[i]) end
-      end
-   end
+--IVS
+local function enable_ivs()
+  ltjb.package_warning('luatexja-otf',
+    'luatexja.otf.enable_ivs() has now no effect.')
 end
+local disable_ivs = enable_ivs
 
--------------------- all done
 luatexja.otf = {
   append_jglyph = append_jglyph,
   enable_ivs = enable_ivs,  -- 隠し機能: IVS
-  font_ivs_table = font_ivs_table,
-  cid = cid,
+  disable_ivs = disable_ivs,  -- 隠し機能: IVS
+  cid = cid, utf = utf,
 }
 
+
 -- EOF