X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-rmlgbm.lua;h=a4a06c777505c0a1f02625a6d77f008a1abe7186;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=b1be80610df11e637309616e1ac8a365c1e8d3b6;hpb=996dc91c8ce7f8adb2c4bb2b3c57427a47ff978a;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index b1be806..a4a06c7 100644
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -5,7 +5,8 @@ luatexja.load_module('base');      local ltjb = luatexja.base
 
 local cidfont_data = {}
 local cache_chars = {}
-local cache_ver = '3'
+local cache_ver = 5
+local identifiers = fonts.hashes.identifiers
 
 local cid_reg, cid_order, cid_supp, cid_name
 local cid_replace = {
@@ -138,29 +139,28 @@ do
          ttu[cid_order .. '.' .. i] = cidmo[i]
       end
 
-      -- 縦書用字形
-      tt, cidm = {}, {}
-      for i = 0,kx[2] do cidm[i] = -1 end
-      open_cmap_file(kx[1] .. "-V", increment, tonumber, entry)
-      local ttv = {}
-      for i,v in pairs(tt) do ttv[i] =  cidmo[v.index] end
-
       -- shared
       k.shared = {
          otfdata = {
             cidinfo= k.cidinfo, verbose = false,
             shared = { featuredata = {}, },
-	    luatex = { features = {},
-		       defaultwidth=1000,
-		     },
          },
          dynamics = {}, features = {}, processes = {},
-	 ltj_vert_table = ttv
-      }
+         --rawdata = { descriptions = {} },
+     }
       k.resources = { unicodes = ttu, }
       k.descriptions = {}
       cache_chars[cid_name]  = { [655360] = k.characters }
 
+      -- 縦書用字形
+      tt, cidm = {}, {}
+      local ttv = {}; k.shared.ltj_vert_table = ttv
+      for i = 0,kx[2] do cidm[i] = -1 end
+      open_cmap_file(kx[1] .. "-V", increment, tonumber, entry)
+      for i,v in pairs(tt) do
+         ttv[i] =  cidmo[v.index]
+      end
+
       -- tounicode エントリ
       local cidp = {nil, nil}; tt, ttu, cidm = {}, {}, {}
       open_cmap_file(cid_name .. "-UCS2",
@@ -193,6 +193,26 @@ do
 end
 
 --
+local cidf_vert_processor
+do
+   local traverse_id = node.traverse_id
+   local id_glyph = node.id('glyph')
+   cidf_vert_processor = {
+      function (head, fnum)
+         local fontdata = identifiers[fnum]
+         if fontdata.is_ltj_vert then
+            local vt = fontdata.shared.ltj_vert_table
+            for n in traverse_id(id_glyph, head) do
+               if n.font==fnum then
+                  n.char = vt[n.char] or n.char
+               end
+            end
+            return head, false
+         end
+      end
+   }
+end
+
 local function cid_cache_outdated(t) return t.version~=cache_ver end
 local function read_cid_font()
    local dat = ltjb.load_cache("ltj-cid-auto-" .. string.lower(cid_name),
@@ -205,14 +225,23 @@ local function read_cid_font()
       make_cid_font()
    end
    if cidfont_data[cid_name] then
+      cidfont_data[cid_name].shared.processes = cidf_vert_processor
       for i,v in pairs(cidfont_data[cid_name].characters) do
          if not v.width then v.width = 655360 end
          v.height, v.depth = 576716.8, 78643.2 -- optimized for jfm-ujis.lua
       end
+      return cidfont_data[cid_name]
+   else
+      return nil
    end
 end
 
 -- High-level
+local function prepare_cid_font(reg, ord)
+   cid_reg, cid_order, cid_name, cid_supp = reg, ord, reg .. '-' .. ord
+   return cidfont_data[cid_name] or read_cid_font()
+end
+
 
 local definers = fonts.definers
 local function mk_rml(name, size, id)
@@ -223,7 +252,7 @@ local function mk_rml(name, size, id)
    local fontdata = {}
    local cachedata = {}
    local s = cidfont_data[cid_name]
-   luatexja.rmlgbm.vert_addfunc(id, s.shared.ltj_vert_table)
+   luatexja.rmlgbm.vert_addfunc(id)
    for k, v in pairs(s) do
       fontdata[k] = v
       cachedata[k] = v
@@ -287,10 +316,13 @@ local function mk_rml(name, size, id)
       e = e * 1000
       var, fontdata.extend  = var .. 'x' .. tostring(e), e
    end
+   if string.match(specification.detail, '(%+?vert)') then
+      cachedata.is_ltj_vert = true
+   end
    fontdata.name = specification.name .. size .. var; cachedata.name = fontdata.name
    fontdata.fullname = specification.name .. var; cachedata.fullname = fontdata.fullname
    fontdata.psname = specification.name; cachedata.psname = fontdata.psname
-   fonts.hashes.identifiers[id] = cachedata
+   identifiers[id] = cachedata
 
    return fontdata
 end
@@ -321,17 +353,13 @@ local function font_callback(name, size, id, fallback)
       if not cid_reg then
          cid_reg, cid_order = string.match(s, "^(.-)%-(.-)$")
       end
-      cid_name = cid_reg .. '-' .. cid_order
-      if not cidfont_data[cid_name] then
-         read_cid_font()
-         if not cidfont_data[cid_name] then
-            ltjb.package_error('luatexja',
-                               "bad cid key `" .. s .. "'",
-                               "I couldn't find any non-embedded font information for the CID\n" ..
-                                  '`' .. s .. "'. For now, I'll use `Adobe-Japan1-6'.\n"..
-                                  'Please contact the LuaTeX-ja project team.')
-            cid_name = "Adobe-Japan1"
-         end
+      if not prepare_cid_font(cid_reg, cid_order) then
+	 ltjb.package_error('luatexja',
+			    "bad cid key `" .. s .. "'",
+			    "I couldn't find any non-embedded font information for the CID\n" ..
+			       '`' .. s .. "'. For now, I'll use `Adobe-Japan1-6'.\n"..
+			       'Please contact the LuaTeX-ja project team.')
+	 cid_name = "Adobe-Japan1"
       end
       return mk_rml(basename, size, id)
    else
@@ -344,12 +372,10 @@ local function font_callback(name, size, id, fallback)
 end
 
 luatexja.rmlgbm = {
+   prepare_cid_font = prepare_cid_font,
    cidfont_data = cidfont_data,
    font_callback = font_callback,
    vert_addfunc = function () end, -- dummy, set in ltj-direction.lua
 }
 
-cid_reg, cid_order, cid_name, cid_supp = 'Adobe', 'Japan1', 'Adobe-Japan1'
-read_cid_font()
-
-
+prepare_cid_font('Adobe', 'Japan1')