bugfix

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

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index a0505c5..f12e1a3 100644 (file)
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -5,7 +5,7 @@ luatexja.load_module('base');      local ltjb = luatexja.base
 
 local cidfont_data = {}
 local cache_chars = {}
-local cache_ver = 6
+local cache_ver = 7
 local identifiers = fonts.hashes.identifiers
 
 local cid_reg, cid_order, cid_supp, cid_name
@@ -148,8 +148,11 @@ do
          },
          dynamics = {}, features = {}, processes = {},
          --rawdata = { descriptions = {} },
-     }
-      k.resources = { unicodes = ttu, }
+      }
+      k.resources = { 
+         unicodes = ttu, 
+        features = { dummy={dummy={dflt=true}} }
+      }
       k.descriptions = {}
       cache_chars[cid_name]  = { [655360] = k.characters }
 
@@ -348,6 +351,9 @@ local function font_callback(name, size, id, fallback)
            if xname:len()+1==q then p = nil else p = q + 1 end
         end
       end
+      p = basename:find(":")
+      if p then basename=basename:sub(1,p-1) end
+      if basename:sub(1,1)=="{" and basename:sub(-1)=="}" then basename = basename:sub(2,-2) end
       cid_reg, cid_order = string.match(s, "^(.-)%-(.-)%-(%d-)$")
       if not cid_reg then
          cid_reg, cid_order = string.match(s, "^(.-)%-(.-)$")