Commit 2f7b22e is somehow reverted.

diff --git a/src/ltj-base.lua b/src/ltj-base.lua
index cc241a4..47518a5 100644 (file)
--- a/src/ltj-base.lua
+++ b/src/ltj-base.lua
@@ -475,9 +475,10 @@ do
       local fullpath = savepath .. '/' ..  filename .. luc_suffix
       local s = serialize(t, 'return', false)
       if s then
+        local sa = load(s)
         local f = io.open(fullpath, 'wb')
-        if f then 
-           f:write(string.dump(load(s), true)) 
+        if f and sa then 
+           f:write(string.dump(sa, true)) 
            texio.write('(save cache: ' .. fullpath .. ')')
         end
         f:close()
@@ -495,18 +496,7 @@ do
       texio.write('(load cache: ' .. n .. ')')
       local f = loadfile(n, 'b'); return f
    end
-   function load_cache (filename, outdate)
-      local r = load_cache_a(filename ..  luc_suffix, outdate, luc_load)
-      if r then 
-        return r
-      else
-         local r = load_cache_a(filename .. '.lua', outdate, loadfile)
-        if r then save_cache_luc(filename, r) end -- update the precompiled cache
-        return r
-      end
-   end
-   
-   function load_cache_a (filename, outdate, loader)
+   local function load_cache_a (filename, outdate, loader)
       local result
       for _,v in pairs(path) do
         local fn = join(v, cache_dir, filename)
@@ -521,6 +511,16 @@ do
         return result 
       end
    end
+   function load_cache (filename, outdate)
+      local r = load_cache_a(filename ..  luc_suffix, outdate, luc_load)
+      if r then 
+        return r
+      else
+         local r = load_cache_a(filename .. '.lua', outdate, loadfile)
+        if r then save_cache_luc(filename, r) end -- update the precompiled cache
+        return r
+      end
+   end
 
 end
 

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index 5c8aa9f..b81c269 100644 (file)
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -1,18 +1,9 @@
 --
--- luatexja/rmlgbm.lua
+-- luatexja/ltj-rmlgbm.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.rmlgbm',
-  date = '2013/12/22',
-  description = 'Definitions of non-embedded Japanese (or other CJK) fonts',
-})
-module('luatexja.rmlgbm', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
-
 luatexja.load_module('base');      local ltjb = luatexja.base
 
-cidfont_data = {}
-local cidfont_data = cidfont_data
+local cidfont_data = {}
 local cache_chars = {}
 local cache_ver = '2'
 
@@ -52,6 +43,7 @@ local cid_replace = {
 }
 
 -- reading CID maps
+local make_cid_font
 do
    local line, fh -- line, file handler
    local tt,cidm -- characters, cid->(Unicode)
@@ -113,7 +105,7 @@ do
    local function entry(a)     
       return {index = a} 
    end
-   function make_cid_font()
+   make_cid_font = function ()
       local kx = cid_replace[cid_name]
       if not kx then return end
       local k = {
@@ -188,7 +180,6 @@ do
                       })
    end
 end
-local make_cid_font = make_cid_font
 
 -- 
 local function cid_cache_outdated(t) return t.version~=cache_ver end
@@ -302,7 +293,7 @@ local function mk_rml(name, size, id)
    return fontdata
 end
 
-function font_callback(name, size, id, fallback)
+local function font_callback(name, size, id, fallback)
    local p = utf.find(name, ":") or utf.len(name)+1
    if utf.sub(name, 1, p-1) == 'psft' then
       local s = "Adobe-Japan1-6"
@@ -348,3 +339,9 @@ end
 
 cid_reg, cid_order, cid_name, cid_supp = 'Adobe', 'Japan1', 'Adobe-Japan1'
 read_cid_font()
+
+
+luatexja.rmlgbm = {
+   cidfont_data = cidfont_data,
+   font_callback = font_callback,
+}