ltj-otf.lua: IVS now works with OTF (similar way as ivslist.tex)

diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua
index bc41a90..e9265e2 100644 (file)
--- a/src/ltj-otf.lua
+++ b/src/ltj-otf.lua
@@ -8,6 +8,7 @@ luatexbase.provides_module({
 })
 
 require('unicode')
+require('lualibs')
 
 
 luatexja.load_module('base');      local ltjb = luatexja.base
@@ -177,50 +178,173 @@ luatexbase.add_to_callback("luatexja.find_char_class",
                           cid_set_char_class, "ltj.otf.find_char_class", 1)
 
 -------------------- IVS
+local font_ivs_table = {} -- key: fontnumber
+local enable_ivs
 do
+   local sort = table.sort
+   local uniq_flag
+   local function add_ivs_table(tg, unitable)
+      for gu, gv in pairs(tg) do
+         local ga = gv.altuni
+         if ga then
+           for _,at in pairs(ga) do
+              local bu, vs = at.unicode, (at.variant or 0)-0xE0100
+              if vs>=0 and vs<0xF0 then
+                 if not ivs[bu] then ivs[bu] = {} end
+                 uniq_flag = true
+                  for i,_ in pairs(ivs[bu]) do
+                     if i==vs then uniq_flag = false; break end
+                  end
+                 if uniq_flag then 
+                     ivs[bu][vs] = unitable[gv.name]
+                  end
+              end
+           end
+         end
+      end
+   end
+   local function make_ivs_table(id, fname)
+      ivs = {}
+      local fl = fontloader.open(fname)
+      local ft = fontloader.to_table(fl)
+      local unicodes = id.resources.unicodes
+      add_ivs_table(ft.glyphs, id.resources.unicodes)
+      if ft.subfonts then
+         for _,v in pairs(ft.subfonts) do
+            add_ivs_table(v.glyphs, id.resources.unicodes)
+         end
+      end
+      fontloader.close(fl)
+      return ivs
+   end
+
+-- loading and saving
+   local font_ivs_basename = {} -- key: basename
+   local path           = {
+      localdir  = kpse.expand_var("$TEXMFVAR"),
+      systemdir = kpse.expand_var("$TEXMFSYSVAR"),
+   }
+   local cache_dir = '/luatexja'
+   local checksum = file.checksum
+
+   local function ivs_cache_save(id, fname)
+      local savepath  = path.localdir .. cache_dir
+      if not lfs.isdir(savepath) then dir.mkdirs(savepath) end
+      savepath = file.join(savepath, "ivs_" .. string.lower(file.nameonly(fname)) .. ".lua")
+      local result = make_ivs_table(id, fname)
+      if file.iswritable(savepath) then
+         table.tofile(savepath, { checksum(fname), result },
+           'return', false, true, false )
+         --ltjb.package_info_no_line('luatexja', "saved :'" .. savepath .. "'", '')
+         print("saved :'" .. savepath .. "'", '')
+      else 
+         --ltjb.package_warning_no_line('luatexja', "failed to save to '" .. savepath .. "'", '')
+         print("failed to save to '" .. savepath .. "'", '')
+      end
+      return result
+   end
+
+   local function ivs_cache_load(cname, id, fname)
+      local result = require(cname)
+      local newsum = checksum(fname)
+      if newsum~=result[1] then
+         return ivs_cache_save(id, fname)
+      else
+         return result[2]
+      end
+   end
+
+   local function prepare_ivs_data(n, id)
+      -- test if already loaded
+      if type(id)=='number' then 
+         font_ivs_table[n] = font_ivs_table[id]; return 
+      end
+      local fname = id.filename
+      local bname = file.basename(fname)
+      if not fname then 
+         font_ivs_table[n] = {}; return
+      elseif font_ivs_basename[bname] then 
+         font_ivs_table[n] = font_ivs_basename[bname]; return
+      end
+      
+      -- if cache is present; read them
+      local v = "ivs_" .. string.lower(file.nameonly(fname)) .. ".lua"
+      local localpath  = file.join(path.localdir, cache_dir, v)
+      local systempath = file.join(path.systemdir, cache_dir , v)
+      local kpsefound  = kpse.find_file(v)
+      if kpsefound and file.isreadable(kpsefound) then
+         font_ivs_basename[bname] = ivs_cache_load(kpsefound, id, fname)
+      elseif file.isreadable(localpath)  then
+         font_ivs_basename[bname] = ivs_cache_load(localpath, id, fname)
+      elseif file.isreadable(systempath) then
+         font_ivs_basename[bname] = ivs_cache_load(systempath, id, fname)
+      else
+         font_ivs_basename[bname] = ivs_cache_save(id, fname)
+      end
+      if not font_ivs_basename[bname] then font_ivs_basename[bname] = {} end
+      font_ivs_table[n] = font_ivs_basename[bname]
+   end
+   local ivs = {}
+   ivs.font_ivs_table = font_ivs_table
+   luatexja.ivs = ivs
+
+-- 組版時
    local get_node_font = function(p)
       return (ltjc_is_ucs_in_japanese_char(p) and (has_attr(p, attr_curjfnt) or 0) or p.font)
    end
-   local get_current_font = function() return tex.attribute[attr_curjfnt] or 0 end
    local function do_ivs_repr(head)
       local p = head
       while p do
         local pid = p.id
         if pid==id_glyph then
-           local pf = get_node_font(p)
-           local pt = identifiers[pf]
-           pt = pt and pt.resources; pt = pt and pt.variants
-           if pt then
-              local q = node_next(p) -- the next node of p
-              if q and q.id==id_glyph then
-                 local qc = q.char
-                 if qc>=0xE0100 and qc<0xE01F0 then -- q is an IVS selector
-                    pt = pt[qc];  pt = pt and  pt[p.char]
-                 if pt then
-                    p.char = pt or p.char
-                 end
-                 head = node_remove(head,q)
-                 end
-              end
-        end
-        end
+           local pt = font_ivs_table[get_node_font(p)]
+            local q = node_next(p) -- the next node of p
+            if q and q.id==id_glyph then
+               local qc = q.char
+               if qc>=0xE0100 and qc<0xE01F0 then -- q is an IVS selector
+                  pt = pt and pt[p.char];  pt = pt and  pt[qc-0xE0100]
+                  if pt then
+                     p.char = pt or p.char
+                  end
+                  head = node_remove(head,q)
+               end
+            end
+         end
         p = node_next(p)
       end
       return head
    end
-   function enable_ivs()
+
+   -- font define
+   local function font_callback(name, size, id, fallback)
+      local d = fallback(name, size, id)
+      prepare_ivs_data(id, d)
+      return d
+   end
+
+   enable_ivs = function ()
       luatexbase.add_to_callback('hpack_filter', 
                                 function (head) return do_ivs_repr(head) end,'do_ivs', 1)
       luatexbase.add_to_callback('pre_linebreak_filter', 
                                 function (head) return do_ivs_repr(head) end, 'do_ivs', 1)
+      local ivs_callback = function (name, size, id)
+         return font_callback(
+            name, size, id, 
+            function (name, size, id) return luatexja.font_callback(name, size, id) end
+         )
+      end
+      luatexbase.add_to_callback('define_font',ivs_callback,"luatexja.ivs_font_callback", 1)
+      for i=1,font.nextid()-1 do
+         if identifiers[i] then prepare_ivs_data(i, identifiers[i]) end
+      end
    end
-
 end
 
 -------------------- all done
 luatexja.otf = {
   append_jglyph = append_jglyph,
-  enable_ivs = enable_ivs,  -- 隠し機能: IVS（TTF しか現状では使えない）
+  enable_ivs = enable_ivs,  -- 隠し機能: IVS
+  font_ivs_table = font_ivs_table,
   cid = cid,
 }
 

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index e08cbf1..7ee8103 100644 (file)
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -15,12 +15,12 @@ cidfont_data = {}
 local cidfont_data = 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),
+    localdir  = kpse.expand_var("$TEXMFVAR"),
+    systemdir = kpse.expand_var("$TEXMFSYSVAR"),
 }
+local cache_dir = '/luatexja'
 
 local cid_reg, cid_order, cid_supp, cid_name
-local taux_dir = 'luatex-cache/luatexja'
 local cid_replace = {
    ["Adobe-Japan1"] = {"UniJIS2004-UTF32", 23057, 6,
                       function (i)
@@ -184,7 +184,7 @@ do
       end
 
       -- Save
-      local savepath  = path.localdir .. '/luatexja/'
+      local savepath  = path.localdir .. cache_dir
       if not lfs.isdir(savepath) then
          dir.mkdirs(savepath)
       end
@@ -211,8 +211,8 @@ 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 .. '/luatexja', v)
-   local systempath = file.join(path.systemdir .. '/luatexja' , v)
+   local localpath  = file.join(path.localdir, cache_dir, v)
+   local systempath = file.join(path.systemdir, cache_dir , v)
    local kpsefound  = kpse.find_file(v)
    if kpsefound and file.isreadable(kpsefound) then
       cid_cache_load(kpsefound)

diff --git a/test/test19-ivs.pdf b/test/test19-ivs.pdf
index 97749dc..c5d4d62 100644 (file)
Binary files a/test/test19-ivs.pdf and b/test/test19-ivs.pdf differ

diff --git a/test/test19-ivs.tex b/test/test19-ivs.tex
index 1796a85..8399ee2 100644 (file)
--- a/test/test19-ivs.tex
+++ b/test/test19-ivs.tex
@@ -1,26 +1,23 @@
 %#!lualatex
 \documentclass{ltjsarticle}
 \usepackage{luatexja-fontspec,luatexja-otf, luacode, booktabs,array}
+\usepackage[scale=0.80]{geometry}
 
 \begin{luacode}
    local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
-   local identifiers = fonts.hashes.identifiers
    local ubyte = unicode.utf8.byte
    local uchar = unicode.utf8.char
    local sort = table.sort
    function list_ivs(s)
       local c = ubyte(s)
-      local pt = identifiers[tex.attribute[attr_curjfnt]]
-      pt = pt and pt.resources; pt = pt and pt.variants
+      local pt = luatexja.otf.font_ivs_table[tex.attribute[attr_curjfnt]][c]
       if pt then
          local t = {}
-         for i,v in pairs(pt) do
-            if v[c] then t[1+#t]=i end
-         end
+         for i,_ in pairs(pt) do t[1+#t]=i end
          sort(t)
-         for _,v in ipairs(t) do 
-            tex.sprint('\\oalign{' .. s .. uchar(v) 
-                          .. '\\crcr\\hss\\tiny' .. tostring(v-0xE0100) .. '\\hss\\crcr}') 
+         for _,i in ipairs(t) do 
+            tex.sprint('\\oalign{' .. s .. uchar(i+0xE0100)
+                          .. '\\crcr\\hss\\tiny' .. tostring(i) .. '\\hss\\crcr}') 
          end
       end
    end
@@ -29,7 +26,7 @@
 \def\MJI[#1]#2{#2\char\numexpr "E0100+#1\relax}%"
 \def\IVSL#1{\directlua{list_ivs('#1')}}
 \begin{document}
-\jfontspec{ipamjm.ttf} % IPA MJ 明朝
+\jfontspec{ipamjm} % IPA MJ 明朝
 
 例文はZRさんのブログ記事「ipamjmパッケージでアレしてみた」\footnote{%
 \verb+http://d.hatena.ne.jp/zrbabbler/20131214/1387029624+}より引用．
@@ -63,6 +60,38 @@
 \end{quote}
 
 \begin{center}
+IPA MJ 明朝\par\medskip
+\Large
+\begin{tabular}{c>{\tt}ll}
+\toprule
+文字&Unicode&IVS\\
+\midrule
+邉&U+9089&\IVSL{邉}\\
+邊&U+908A&\IVSL{邊}\\
+𫟪&U+2B7EA&\IVSL{𫟪}\\
+\bottomrule
+\end{tabular}
+\end{center}
+
+\jfontspec{kozminpr6n-regular} % 小塚明朝 Pr6N R
+\begin{center}
+小塚明朝 Pr6N R\par\medskip
+\Large
+\begin{tabular}{c>{\tt}ll}
+\toprule
+文字&Unicode&IVS\\
+\midrule
+邉&U+9089&\IVSL{邉}\\
+邊&U+908A&\IVSL{邊}\\
+𫟪&U+2B7EA&\IVSL{𫟪}\\
+\bottomrule
+\end{tabular}
+\end{center}
+
+
+\jfontspec{hanamina} % 花園明朝A
+\begin{center}
+花園明朝A\par\medskip
 \Large
 \begin{tabular}{c>{\tt}ll}
 \toprule