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

diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua
index 095d969..0e54210 100644
--- a/src/ltj-otf.lua
+++ b/src/ltj-otf.lua
@@ -58,33 +58,73 @@ luatexja.userid_table.OTF = luatexbase.newuserwhatsitid('char_by_cid',  'luatexj
 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 = (luatexja.otf.ivd_aj1 and luatexja.otf.ivd_aj1[c]
-     or ltjr_cidfont_data["Adobe-Japan1"].resources.unicodes["Japan1." .. tostring(c)])
-     or 0
-   if type(v)~='number' then -- table
+   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[v[2]]
-      return curjfnt and curjfnt[v[1]] or v[1]
+      curjfnt = curjfnt and curjfnt[ivs]
+      return curjfnt and curjfnt[base] or base
    elseif v<0xF0000 then -- 素直に Unicode にマップ可能
       return v
    else -- privete use area
-      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
+      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
 
@@ -98,10 +138,39 @@ local function append_jglyph(char)
    node_write(p)
 end
 
+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
+end
+
 local cid
 do
    cid = function (key)
-      if key==0 then return append_jglyph(char) end
+      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]
@@ -110,25 +179,23 @@ do
          cidinfo.ordering ~= "Japan1" and
          cidinfo.ordering ~= "GB1" and
          cidinfo.ordering ~= "CNS1" and
-         cidinfo.ordering ~= "Korea1" then
+         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))
-      end
-      local fe, char = ltjf_font_extra_info[curjfnt_num], nil
-      if fe and fe.unicodes then 
-         char = fe.unicodes[cidinfo.ordering..'.'..tostring(key)]
-      end
-      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.')
+      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
-      return append_jglyph(char)
    end
 end
 
@@ -173,19 +240,17 @@ ltjb.add_to_callback('pre_linebreak_filter', extract,'ltj.otf',
 -- 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]
-   local fe = ltjf_font_extra_info[fn]
-   if (fi.resources and fi.resources.cidinfo and fi.resources.cidinfo.ordering == "Japan1" )
-      and (fe and fe.unicodes) then
+   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(fe.unicodes['Japan1.'..tostring(j)])
+	    j = t[i]
 	    if j then
 	       fmtable.cid_char_type = fmtable.cid_char_type  or {}
 	       fmtable.cid_char_type[j] = v
@@ -196,10 +261,10 @@ local function cid_to_char(fmtable, fn)
    return fmtable
 end
 luatexbase.add_to_callback("luatexja.define_jfont",
-			   cid_to_char, "ltj.otf.define_jfont", 1)
+			   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
 
 
@@ -224,10 +289,8 @@ luatexja.otf = {
   append_jglyph = append_jglyph,
   enable_ivs = enable_ivs,  -- 隠し機能: IVS
   disable_ivs = disable_ivs,  -- 隠し機能: IVS
-  cid = cid,
+  cid = cid, utf = utf,
 }
 
-luatexja.load_module('ivd_aj1')
-
 
 -- EOF