Added lltjp-everyshi.sty

[luatex-ja/luatexja.git] / src / ltj-rmlgbm.lua

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index 2b5b2e5..bd3110f 100644 (file)
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -1,11 +1,11 @@
 --
--- luatexja/ltj-rmlgbm.lua
+-- ltj-rmlgbm.lua
 --
 luatexja.load_module('base');      local ltjb = luatexja.base
 
 local cidfont_data = {}
 local cache_chars = {}
-local cache_ver = 8
+local cache_ver = 9
 local identifiers = fonts.hashes.identifiers
 
 local cid_reg, cid_order, cid_supp, cid_name
@@ -100,7 +100,7 @@ do
    local function open_cmap_file(name, inc, cid_dec, mke)
       local fn = kpse.find_file(name, 'cmap files')
       if fn then
-         local fh = io.open(fn, "r")
+         fh = io.open(fn, "r")
          line = fh:read("*l")
          while line do
             if string.find(line, "%x+%s+begin...?char") then
@@ -181,11 +181,11 @@ do
 
       -- 縦書用字形
       tt, cidm = {}, {}
-      local ttv = {}; k.shared.ltj_vert_table = ttv
+      local ttv = {}; k.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]
+        ttv[i] =  cidmo[v.index] -- "unicode" of vertical variant
       end
 
       -- tounicode エントリ
@@ -210,7 +210,9 @@ do
       end
 
       -- Save
-      k.characters[46].width = math.floor(655360/14);
+      if k and k.characters and k.characters[46] then
+        k.characters[46].width = math.floor(655360/14);
+      end
       ltjb.save_cache( "ltj-cid-auto-" .. string.lower(cid_name),
                       {
                          version = cache_ver,
@@ -228,11 +230,12 @@ do
    local getfont = node.direct.getfont
    local getchar = node.direct.getchar
    local setchar = node.direct.setchar
+   local font_getfont = font.getfont
    cidf_vert_processor = {
       function (head, fnum)
-         local fontdata = identifiers[fnum]
+         local fontdata = font_getfont(fnum)
          if head and luatexja.jfont.font_metric_table[fnum].vert_activated then
-           local vt = fontdata.shared.ltj_vert_table
+           local vt = fontdata.ltj_vert_table
            local nh = is_node(head) and to_direct(head) or head 
             for n in traverse_id(id_glyph, head) do
                if getfont(n)==fnum then
@@ -398,11 +401,13 @@ local function font_callback(name, size, id, fallback)
       end
       return mk_rml(basename, size, id)
    else
-      local tfmdata=fallback(name, size, id)
-      if type (tfmdata) == "table" and tfmdata.shared then
-        luatexbase.call_callback("luaotfload.patch_font", tfmdata, name)
+      local fontdata=fallback(name, size, id)
+      if type (fontdata) == "table" and fontdata.encodingbytes == 2 then
+        luatexbase.call_callback ("luaotfload.patch_font", fontdata, name, id)
+      else
+        luatexbase.call_callback ("luaotfload.patch_font_unsafe", fontdata, name, id)
       end
-      return tfmdata
+      return fontdata
    end
 end