X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-rmlgbm.lua;h=b81c269ab437ad7013f55d0f167327907f33c360;hb=e9e03ab63bb21484ffecb25bbd5fe88eac4aca3c;hp=56e8b1f791d97a647dabc7f6a4314752b04ac40d;hpb=4f8d9c35887aaffb82e43dc8fe09e5ebdf8f2fd0;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index 56e8b1f..b81c269 100644
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -1,28 +1,15 @@
 --
--- luatexja/rmlgbm.lua
+-- luatexja/ltj-rmlgbm.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.rmlgbm',
-  date = '2013/03/17',
-  version = '0.4',
-  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
 
 local cidfont_data = {}
 local cache_chars = {}
-local path           = {
-    localdir  = file.join(kpse.expand_var("$TEXMFVAR"), aux_dir),
-    systemdir = file.join(kpse.expand_var("$TEXMFSYSVAR"), aux_dir),
-}
+local cache_ver = '2'
 
 local cid_reg, cid_order, cid_supp, cid_name
-local taux_dir = 'luatex-cache/luatexja'
 local cid_replace = {
-   ["Adobe-Japan1"] = {"UniJIS-UTF32", 23057, 
+   ["Adobe-Japan1"] = {"UniJIS2004-UTF32", 23057, 6,
 		       function (i)
 			  if (231<=i and i<=632) or (8718<=i and i<=8719) 
 		             or (12063<=i and i<=12087) then
@@ -32,24 +19,22 @@ local cid_replace = {
 			  elseif 9738<=i and i<=9757 then
 			     return 163840 -- 655360/4
 			  end
-		       end, 
-		       "UniJIS2004-UTF32"},
-                       -- 基本的には JIS X 0208:1990 に沿ったマッピングだが
-                       -- JIS X 0213:2004 のみにある字も使えるようにする
-   ["Adobe-Korea1"] = {"UniKS-UTF32",  18351,
+		       end},
+                       -- 基本的には JIS X 0213:2004 に沿ったマッピング
+   ["Adobe-Korea1"] = {"UniKS-UTF32",  18351, 2, 
 		       function (i)
 			  if 8094<=i and i<=8100 then 
 			     return 327680 -- 655360/2
 			  end
 		       end},
-   ["Adobe-GB1"]    = {"UniGB-UTF32",  30283,
+   ["Adobe-GB1"]    = {"UniGB-UTF32",  30283, 5, 
 		       function (i)
 			  if (814<=i and i<=939) or (i==7716) 
 		             or (22355<=i and i<=22357) then
 			     return 327680 -- 655360/2
 			  end
 		       end},
-   ["Adobe-CNS1"]   = {"UniCNS-UTF32", 19155,
+   ["Adobe-CNS1"]   = {"UniCNS-UTF32", 19155, 6,
 		       function (i)
 			  if (13648<=i and i<=13742) or (i==17603) then
 			     return 327680 -- 655360/2
@@ -58,10 +43,11 @@ local cid_replace = {
 }
 
 -- reading CID maps
+local make_cid_font
 do
    local line, fh -- line, file handler
-   local tt, cidm  -- characters, cid->glyph_index
-   
+   local tt,cidm -- characters, cid->(Unicode)
+
    local function load_cid_char(cid_dec, mke)
       local cid, ucs, ucsa
       line = fh:read("*l")
@@ -116,26 +102,26 @@ do
    end
    
    local function increment(a) return a+1 end
-   local function entry(a)     return {index = a} end
-   function make_cid_font()
+   local function entry(a)     
+      return {index = a} 
+   end
+   make_cid_font = function ()
+      local kx = cid_replace[cid_name]
+      if not kx then return end
       local k = {
-         cidinfo = { ordering=cid_order, registry=cid_reg, supplement=cid_supp },
+         cidinfo = { ordering=cid_order, registry=cid_reg, supplement=kx[3] },
          encodingbytes = 2, extend=1000, format = 'opentype',
          direction = 0, characters = {}, parameters = {}, embedding = "no", cache = "yes", 
          ascender = 0, descender = 0, factor = 0, hfactor = 0, vfactor = 0,
 	 tounicode = 1,
       }
-      local kx = cid_replace[cid_name]
       cidfont_data[cid_name] = k
 
-      -- CID => Unicode 負号空間
+      -- CID => Unicode 符号空間
       -- TODO: vertical fonts?
       tt, cidm = {}, {}
       for i = 0,kx[2] do cidm[i] = -1 end
       open_cmap_file(kx[1] .. "-H", increment, tonumber, entry)
-      if kx[4] then
-         open_cmap_file(kx[4] .. "-H", increment, tonumber, entry)
-      end
       k.characters = tt
 
       -- Unicode にマップされなかった文字の処理
@@ -143,11 +129,24 @@ do
       local ttu, pricode = {}, 0xF0000
       for i,v in ipairs(cidm) do
          if v==-1 then 
-            tt[pricode], cidm[i], pricode=  { index = i }, pricode, pricode+1;
+            tt[pricode], cidm[i], pricode 
+	       = { index = i }, pricode, pricode+1;
          end
          ttu[cid_order .. '.' .. i] = cidm[i]
       end
-      k.unicodes = ttu      
+      -- shared
+      k.shared = {
+         otfdata = { 
+            cidinfo= k.cidinfo, verbose = false, 
+            shared = { featuredata = {}, }, 
+            luatex = { features = {}, 
+		       defaultwidth=1000, 
+		       sequences = {  }, },
+         },
+         dynamics = {}, features = {}, processes = {}, 
+      }
+      k.resources = { unicodes = ttu, }
+      k.descriptions = {}
       cache_chars[cid_name]  = { [655360] = k.characters }
 
       -- tounicode エントリ
@@ -164,65 +163,36 @@ do
 		     end,
 		     function(a) return a[1] ..string.format('%04X',a[2])  end)
       -- tt は cid -> tounicode になっているので cidm -> tounicode に変換
+      local kxf = kx[4]
       for i,v in ipairs(cidmo) do
-	 k.characters[v].width = kx[3](i)
+	 k.characters[v].width = kxf(i)
 	 if v>=0xF0000 then
 	    k.characters[v].tounicode = tt[i]
 	 end
       end
 
-      -- shared
-      k.shared = {
-         otfdata = { 
-            cidinfo= k.cidinfo, verbose = false, 
-            shared = { featuredata = {}, }, 
-            luatex = { features = {}, defaultwidth=1000, sequences = {  }, },
-         },
-         dynamics = {}, features = {}, processes = {}, 
-      }
-      k.descriptions = {}
-
       -- Save
-      local savepath  = path.localdir .. '/luatexja/'
-      if not lfs.isdir(savepath) then
-         dir.mkdirs(savepath)
-      end
-      savepath = file.join(savepath, "ltj-cid-auto-" 
-                           .. string.lower(cid_name)  .. ".lua")
-      if file.iswritable(savepath) then
-         k.characters[46].width = math.floor(655360/14);
-	 -- Standard fonts are ``seriffed''. 
-         table.tofile(savepath, k,'return', false, true, false )
-      else 
-         ltjb.package_warning('luatexja', 
-                              'failed to save informations of non-embedded 2-byte fonts', '')
-      end
+      k.characters[46].width = math.floor(655360/14);
+      ltjb.save_cache( "ltj-cid-auto-" .. string.lower(cid_name),
+		       {
+			  version = cache_ver,
+			  k,
+		       })
    end
 end
-local make_cid_font = make_cid_font
 
 -- 
+local function cid_cache_outdated(t) return t.version~=cache_ver end
 local function read_cid_font()
-   -- local v = "ltj-cid-" .. string.lower(cid_name) .. ".lua"
-   local v = "ltj-cid-auto-" .. string.lower(cid_name) .. ".lua"
-   local localpath  = file.join(path.localdir, v)
-   local systempath = file.join(path.systemdir, v)
-   local kpsefound  = kpse.find_file(v)
-   if kpsefound and file.isreadable(kpsefound) then
-      cidfont_data[cid_name] = require(kpsefound)
-      cache_chars[cid_name]  = { [655360] = cidfont_data[cid_name].characters }
-   elseif file.isreadable(localpath)  then
-      cidfont_data[cid_name] = require(localpath)
-      cache_chars[cid_name]  = { [655360] = cidfont_data[cid_name].characters }
-   elseif file.isreadable(systempath) then
-      cidfont_data[cid_name] = require(systempath)
+   local dat = ltjb.load_cache("ltj-cid-auto-" .. string.lower(cid_name),
+			       cid_cache_outdated )
+   if dat then 
+      cidfont_data[cid_name] = dat[1]
       cache_chars[cid_name]  = { [655360] = cidfont_data[cid_name].characters }
+   else
+      -- Now we must create the virtual metrics from CMap.
+      make_cid_font()
    end
-   -- Now we must create the virtual metrics from CMap.
-   ltjb.package_info('luatexja', 
-			'I try to generate informations of non-embedded 2-byte fonts...', '')
-   make_cid_font()
-
    if cidfont_data[cid_name] then
       for i,v in pairs(cidfont_data[cid_name].characters) do
          if not v.width then v.width = 655360 end
@@ -232,10 +202,12 @@ local function read_cid_font()
 end
 
 -- High-level
+
+local definers = fonts.definers
 local function mk_rml(name, size, id)
-   local specification = fonts.define.analyze(name,size)
-   specification = fonts.define.specify[':'](specification)
-   local features = specification.features.normal
+   local specification = definers.analyze(name,size)
+   specification = definers.resolve(specification)
+   specification.detail = specification.detail or ''
 
    local fontdata = {}
    local cachedata = {}
@@ -246,7 +218,6 @@ local function mk_rml(name, size, id)
    end
    fontdata.characters = nil
    cachedata.characters = nil
-   fontdata.unicodes = nil
    fontdata.shared = nil
    cachedata.shared = nil
    if s.shared then
@@ -255,65 +226,84 @@ local function mk_rml(name, size, id)
       for k, v in pairs(s.shared) do
 	 shared[k] = v
       end
-      
-      shared.set_dynamics = fonts.otf.set_dynamics 
-      shared.processes, shared.features = fonts.otf.set_features(cachedata,fonts.define.check(features,fonts.otf.features.default))
    end
 
    -- characters & scaling
    if size < 0 then size = -size * 655.36 end
    local scale = size / 655360
-   local def_height =  0.88 * size -- character's default height (optimized for jfm-ujis.lua)
-   local def_depth =  0.12 * size  -- and depth.
-   if not cache_chars[cid_name][size] then
-      cache_chars[cid_name][size]  = {}
-      for k, v in pairs(cache_chars[cid_name][655360]) do
-         cache_chars[cid_name][size][k] = { 
-	    index = v.index, width = v.width * scale, 
-	    height = def_height, depth = def_depth, tounicode = v.tounicode,
-	 }
+
+   do
+      local def_height =  0.88 * size 
+      -- character's default height (optimized for jfm-ujis.lua)
+      local def_depth =  0.12 * size  -- and depth.
+      if not cache_chars[cid_name][size] then
+	 cache_chars[cid_name][size]  = {}
+	 for k, v in pairs(cache_chars[cid_name][655360]) do
+	    cache_chars[cid_name][size][k] = { 
+	       index = v.index, width = v.width * scale, 
+	       height = def_height, depth = def_depth, tounicode = v.tounicode,
+	    }
+	 end
       end
+      fontdata.characters = cache_chars[cid_name][size]
+      cachedata.characters = cache_chars[cid_name][size]
    end
-   fontdata.characters = cache_chars[cid_name][size]
-   cachedata.characters = cache_chars[cid_name][size]
 
-   local parameters = {}
-   for k, v in pairs(s.parameters) do
-      parameters[k] = v * scale
+   -- other parameters
+   do
+      local parameters = {}
+      for k, v in pairs(s.parameters) do
+	 parameters[k] = v * scale
+      end
+      fontdata.parameters  = parameters
+      fontdata.ascender    = fontdata.ascender * scale
+      fontdata.descender   = fontdata.descender * scale
+      fontdata.factor      = fontdata.factor * scale
+      fontdata.hfactor     = fontdata.hfactor * scale
+      fontdata.vfactor     = fontdata.vfactor * scale
+      fontdata.size        = size
+      fontdata.resources   = s.resources
+      cachedata.parameters = parameters
+      cachedata.ascender   = fontdata.ascender
+      cachedata.descender  = fontdata.descender
+      cachedata.factor     = fontdata.factor
+      cachedata.hfactor    = fontdata.hfactor
+      cachedata.vfactor    = fontdata.vfactor
+      cachedata.size       = size
+      cachedata.resources  = s.resources
    end
-   fontdata.parameters = parameters;                cachedata.parameters = parameters
-   fontdata.ascender = fontdata.ascender * scale;   cachedata.ascender = fontdata.ascender
-   fontdata.descender = fontdata.descender * scale; cachedata.descender = fontdata.descender
-   fontdata.factor = fontdata.factor * scale;       cachedata.factor = fontdata.factor
-   fontdata.hfactor = fontdata.hfactor * scale;     cachedata.hfactor = fontdata.hfactor
-   fontdata.vfactor = fontdata.vfactor * scale;     cachedata.vfactor = fontdata.vfactor
-   fontdata.size = size;                            cachedata.size = size
 
    -- no embedding
    local var = ''
-   if features.slant then 
-      fontdata.slant = features.slant*1000;         cachedata.slant = fontdata.slant
-      var = var .. 's' .. tostring(features.slant)
+   local s = string.match(specification.detail, 'slant=([+-]*%d*%.?%d)')
+   if s and e~=0  then 
+      s = s * 1000
+      var, fontdata.slant  = var .. 's' .. tostring(s), s
+   end
+   local e = string.match(specification.detail, 'extend=([+-]*%d*%.?%d)')
+   if e and e~=1  then 
+      e = e * 1000
+      var, fontdata.extend  = var .. 'x' .. tostring(e), e
    end
-   if features.extend then 
-      fontdata.extend = features.extend*1000;       cachedata.extend = fontdata.extend
-       var = var .. 'x' .. tostring(features.extend)
-  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.ids[id] = cachedata
+   fonts.hashes.identifiers[id] = cachedata
 
    return fontdata
 end
 
-local dr_orig = fonts.define.read
-function fonts.define.read(name, size, id)
+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"
       local basename = utf.sub(name,p+1)
       local p = utf.find(basename, ":")
+      local q = utf.find(basename, "/[BI][BI]?")
+      if q and p and q<=p then
+	 basename = utf.gsub(basename, '/[BI][BI]?', '', 1)
+	 p = utf.find(basename, ":")
+      end
       if p then 
 	 local xname = utf.sub(basename, p+1)
 	 p = 1
@@ -343,9 +333,15 @@ function fonts.define.read(name, size, id)
       end
       return mk_rml(basename, size, id)
    else 
-      return dr_orig(name, size, id)
+      return fallback(name, size, id)
    end
 end
 
-cid_reg, cid_order, cid_name = 'Adobe', 'Japan1', 'Adobe-Japan1'
-read_cid_font()
\ No newline at end of file
+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,
+}