luatexja (21apr15)

git-svn-id: svn://tug.org/texlive/trunk@36992 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 108 insertions, 78 deletions

diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
index 23b7e962dd6..2430ef3f7c1 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
@@ -5,13 +5,14 @@ luatexja.load_module('base');      local ltjb = luatexja.base
 
 local cidfont_data = {}
 local cache_chars = {}
-local cache_ver = '2'
+local cache_ver = 5
+local identifiers = fonts.hashes.identifiers
 
 local cid_reg, cid_order, cid_supp, cid_name
 local cid_replace = {
    ["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
@@ -21,15 +22,15 @@ local cid_replace = {
 			  end
 		       end},
                        -- 基本的には JIS X 0213:2004 に沿ったマッピング
-   ["Adobe-Korea1"] = {"UniKS-UTF32",  18351, 2, 
+   ["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, 5, 
+   ["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
@@ -52,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
@@ -69,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)
@@ -98,12 +99,12 @@ 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
    make_cid_font = function ()
       local kx = cid_replace[cid_name]
@@ -111,52 +112,62 @@ do
       local k = {
          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,
       }
       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
@@ -181,12 +192,32 @@ do
    end
 end
 
--- 
+--
+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 fontdata.is_ltj_vert 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 dat = ltjb.load_cache("ltj-cid-auto-" .. string.lower(cid_name),
 			       cid_cache_outdated )
-   if dat then 
+   if dat then
       cidfont_data[cid_name] = dat[1]
       cache_chars[cid_name]  = { [655360] = cidfont_data[cid_name].characters }
    else
@@ -194,6 +225,7 @@ local function read_cid_font()
       make_cid_font()
    end
    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
@@ -212,6 +244,7 @@ local function mk_rml(name, size, id)
    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
@@ -233,14 +266,14 @@ local function mk_rml(name, size, id)
    local scale = size / 655360
 
    do
-      local def_height =  0.88 * size 
+      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, 
+	    cache_chars[cid_name][size][k] = {
+	       index = v.index, width = v.width * scale,
 	       height = def_height, depth = def_depth, tounicode = v.tounicode,
 	    }
 	 end
@@ -256,19 +289,9 @@ local function mk_rml(name, size, id)
 	 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
@@ -276,53 +299,56 @@ local function mk_rml(name, size, id)
    -- no embedding
    local var = ''
    local s = string.match(specification.detail, 'slant=([+-]*%d*%.?%d)')
-   if s and e~=0  then 
+   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 
+   if e and e~=1  then
       e = e * 1000
       var, fontdata.extend  = var .. 'x' .. tostring(e), e
    end
+   if string.match(specification.detail, '(%+?vert)') then
+      cachedata.is_ltj_vert = true
+   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.hashes.identifiers[id] = cachedata
+   identifiers[id] = cachedata
 
    return fontdata
 end
 
 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 p = name:find(":") or name:len()+1
+   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, ":")
-      local q = utf.find(basename, "/[BI][BI]?")
+      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 = utf.gsub(basename, '/[BI][BI]?', '', 1)
-	 p = utf.find(basename, ":")
+	 basename = basename:gsub('/[BI][BI]?', '', 1)
+	 p = basename:find(":")
       end
-      if p then 
-	 local xname = utf.sub(basename, p+1)
+      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 
+      if not cidfont_data[cid_name] then
          read_cid_font()
-         if not cidfont_data[cid_name] then 
+         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" ..
@@ -332,16 +358,20 @@ local function font_callback(name, size, id, fallback)
          end
       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 = {
    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()