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

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index 2430ef3..a4a06c7 100644
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -230,10 +230,18 @@ local function read_cid_font()
          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)
@@ -345,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
@@ -368,10 +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')