X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=inline;f=src%2Fltj-rmlgbm.lua;h=a0505c526261a100f6a8ba14b692cfbd478f01cc;hb=d85642369bcae6331dc9d55fa5978104c7a8631a;hp=4bafaf2142cb91c403685fbc55c994457e011828;hpb=15ed4fcff44d451f64d9e05d0886cb890dbfb614;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index 4bafaf2..a0505c5 100644
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -1,31 +1,18 @@
 --
--- 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
 
-cidfont_data = {}
-local cidfont_data = cidfont_data
+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 = 6
+local identifiers = fonts.hashes.identifiers
 
 local cid_reg, cid_order, cid_supp, cid_name
-local taux_dir = 'luatex-cache/luatexja'
 local cid_replace = {
-   ["Adobe-Japan1"] = {"UniJIS2004-UTF32", 23057, 
+   ["Adobe-Japan1"] = {"UniJIS2004-UTF32", 23057, 6,
 		       function (i)
-			  if (231<=i and i<=632) or (8718<=i and i<=8719) 
+			  if (231<=i and i<=632) or (8718<=i and i<=8719)
 		             or (12063<=i and i<=12087) then
 			     return 327680 -- 655360/2
 			  elseif 9758<=i and i<=9778 then
@@ -35,20 +22,20 @@ local cid_replace = {
 			  end
 		       end},
                        -- 基本的には JIS X 0213:2004 に沿ったマッピング
-   ["Adobe-Korea1"] = {"UniKS-UTF32",  18351,
+   ["Adobe-Korea1"] = {"UniKS-UTF32",  18351, 2,
 		       function (i)
-			  if 8094<=i and i<=8100 then 
+			  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) 
+			  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
@@ -57,6 +44,7 @@ local cid_replace = {
 }
 
 -- reading CID maps
+local make_cid_font
 do
    local line, fh -- line, file handler
    local tt,cidm -- characters, cid->(Unicode)
@@ -65,12 +53,12 @@ do
       local cid, ucs, ucsa
       line = fh:read("*l")
       while line do
-         if string.find(line, "end...?char") then 
+         if string.find(line, "end...?char") then
             line = fh:read("*l"); return
          else -- WMA l is in the form "<%x+>%s%d+"
             ucs, cid = string.match(line, "<(%x+)>%s+<?(%x+)>?")
-            cid = cid_dec(cid); ucs = tonumber(ucs, 16); 
-            if not tt[ucs]  then 
+            cid = cid_dec(cid); ucs = tonumber(ucs, 16);
+            if not tt[ucs]  then
                tt[ucs] = mke(cid); cidm[cid]=ucs
             end
          end
@@ -82,14 +70,14 @@ do
       local bucs, eucs, cid
       line = fh:read("*l")
       while line do
-        if string.find(line, "end...?range") then 
+        if string.find(line, "end...?range") then
             line = fh:read("*l"); return
          else -- WMA l is in the form "<%x+>%s+<%x+>"
             bucs, eucs, cid = string.match(line, "<(%x+)>%s+<(%x+)>%s+<?(%x+)>?")
-            cid = cid_dec(cid); 
+            cid = cid_dec(cid);
 	    bucs = tonumber(bucs, 16); eucs = tonumber(eucs, 16)
             for ucs = bucs, eucs do
-               if not tt[ucs]  then 
+               if not tt[ucs]  then
                   tt[ucs] = mke(cid); cidm[cid]=ucs
                end
                cid = inc(cid)
@@ -111,135 +99,161 @@ do
             line = fh:read("*l")
          end
       end
-      fh:close();  
+      fh:close();
    end
-   
+
    local function increment(a) return a+1 end
-   local function entry(a)     
-      return {index = a} 
+   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 = {
-         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,
+         direction = 0, characters = {}, parameters = {
+	    ascender = 655360*0.88,
+	    descender = 655360*0.12,
+	 },
+	 embedding = "no", cache = "yes", factor = 0, hfactor = 0, vfactor = 0,
 	 tounicode = 1,
+	 properties = { language = "dflt", script = "dflt" },
       }
-      local kx = cid_replace[cid_name]
       cidfont_data[cid_name] = k
 
       -- CID => Unicode 符号空間
-      -- TODO: vertical fonts?
-      tt, cidm = {}, {}
+      local tth, cidmo = {}, {}
+      tt, cidm = tth, cidmo
       for i = 0,kx[2] do cidm[i] = -1 end
       open_cmap_file(kx[1] .. "-H", increment, tonumber, entry)
-      k.characters = tt
+      k.characters = tth
 
       -- Unicode にマップされなかった文字の処理
       -- これらは TrueType フォントを使って表示するときはおかしくなる
       local ttu, pricode = {}, 0xF0000
-      for i,v in ipairs(cidm) do
-         if v==-1 then 
-            tt[pricode], cidm[i], pricode 
+      for i,v in ipairs(cidmo) do
+         if v==-1 then
+            tth[pricode], cidmo[i], pricode
 	       = { index = i }, pricode, pricode+1;
          end
-         ttu[cid_order .. '.' .. i] = cidm[i]
+         ttu[cid_order .. '.' .. i] = cidmo[i]
       end
+
       -- shared
       k.shared = {
-         otfdata = { 
-            cidinfo= k.cidinfo, verbose = false, 
-            shared = { featuredata = {}, }, 
-            luatex = { features = {}, 
-		       defaultwidth=1000, 
-		       sequences = {  }, },
+         otfdata = {
+            cidinfo= k.cidinfo, verbose = false,
+            shared = { featuredata = {}, },
          },
-         dynamics = {}, features = {}, processes = {}, 
-      }
+         dynamics = {}, features = {}, processes = {},
+         --rawdata = { descriptions = {} },
+     }
       k.resources = { unicodes = ttu, }
       k.descriptions = {}
       cache_chars[cid_name]  = { [655360] = k.characters }
 
+      -- 縦書用字形
+      tt, cidm = {}, {}
+      local ttv = {}; k.shared.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]
+      end
+
       -- tounicode エントリ
-      local cidp = {nil, nil}; local cidmo = cidm
-      tt, ttu, cidm = {}, {}, {}
+      local cidp = {nil, nil}; tt, ttu, cidm = {}, {}, {}
       open_cmap_file(cid_name .. "-UCS2",
-		     function(a) 
+		     function(a)
 			a[2] = a[2] +1 ; return a
-		     end, 
-		     function(a) 
+		     end,
+		     function(a)
 			cidp[1] = string.upper(string.sub(a,1,string.len(a)-4))
 			cidp[2] = tonumber(string.sub(a,-4),16)
 			return cidp
 		     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
 
       -- 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 cidf_vert_processor
+do
+   local traverse_id = node.traverse_id
+   local id_glyph = node.id('glyph')
+   cidf_vert_processor = {
+      function (head, fnum)
+         local fontdata = identifiers[fnum]
+         if luatexja.jfont.font_metric_table[fnum].vert_activated then
+            local vt = fontdata.shared.ltj_vert_table
+            for n in traverse_id(id_glyph, head) do
+               if n.font==fnum then
+                  n.char = vt[n.char] or n.char
+               end
+            end
+            return head, false
+         end
+      end
+   }
+end
+
+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
+      cidfont_data[cid_name].shared.processes = cidf_vert_processor
       for i,v in pairs(cidfont_data[cid_name].characters) do
          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)
-   local specification = fonts.definers.analyze(name,size)
-   specification = fonts.definers.resolve(specification)
-   local features = specification.features.normal
+   local specification = definers.analyze(name,size)
+   --specification = definers.resolve(specification) (not needed)
+   specification.detail = specification.detail or ''
 
    local fontdata = {}
    local cachedata = {}
    local s = cidfont_data[cid_name]
+   luatexja.rmlgbm.vert_addfunc(id)
    for k, v in pairs(s) do
       fontdata[k] = v
       cachedata[k] = v
@@ -259,90 +273,108 @@ local function mk_rml(name, size, id)
    -- 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.size        = size
+      fontdata.resources   = s.resources
+      cachedata.parameters = parameters
+      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
-   fontdata.resources = s.resources
-   cachedata.resources = s.resources
-   
+
    -- no embedding
    local var = ''
-  --  if features.slant then 
-  --     fontdata.slant = features.slant*1000;         cachedata.slant = fontdata.slant
-  --     var = var .. 's' .. tostring(features.slant)
-  --  end
-  --  if features.extend then 
-  --     fontdata.extend = features.extend*1000;       cachedata.extend = fontdata.extend
-  --      var = var .. 'x' .. tostring(features.extend)
-  --  end
+   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
    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
+   identifiers[id] = cachedata
 
    return fontdata
 end
 
-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 function font_callback(name, size, id, fallback)
+   if name:sub(1,1)=="{" and name:sub(-1)=="}" then name = name:sub(2,-2) end
+   local p = name:find(":") or 0
+   if name:sub(1, p-1) == 'psft' then
       local s = "Adobe-Japan1-6"
-      local basename = utf.sub(name,p+1)
-      local p = utf.find(basename, ":")
-      if p then 
-	 local xname = utf.sub(basename, p+1)
+      local basename = name:sub(p+1)
+      local p = basename:find(":")
+      local q = basename:find("/[BI][BI]?")
+      if q and p and q<=p then
+	 basename = basename:gsub('/[BI][BI]?', '', 1)
+	 p = basename:find(":")
+      end
+      if p then
+	 local xname = basename:sub(p+1)
 	 p = 1
 	 while p do
-	    local q = utf.find(xname, ";", p+1) or utf.len(xname)+1
-	    if utf.sub(xname, p, p+3)=='cid=' and q>p+4 then
-	       s = utf.sub(xname, p+4, q-1)
+	    local q = xname:find(";", p+1) or xname:len()+1
+	    if xname:sub(p, p+3)=='cid=' and q>p+4 then
+	       s = xname:sub(p+4, q-1)
 	    end
-	    if utf.len(xname)+1==q then p = nil else p = q + 1 end
+	    if xname:len()+1==q then p = nil else p = q + 1 end
 	 end
       end
       cid_reg, cid_order = string.match(s, "^(.-)%-(.-)%-(%d-)$")
-      if not cid_reg then 
+      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 
-      return fallback(name, 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)
+      end
+      return tfmdata
    end
 end
 
-cid_reg, cid_order, cid_name, cid_supp = 'Adobe', 'Japan1', 'Adobe-Japan1'
-read_cid_font()
+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
+}
+
+prepare_cid_font('Adobe', 'Japan1')