test-zh-maqiyuan.tex: CRLF -> LF.

[luatex-ja/luatexja.git] / src / luatexja / otf.lua

diff --git a/src/luatexja/otf.lua b/src/luatexja/otf.lua
index 0b69241..d0f657f 100644 (file)
--- a/src/luatexja/otf.lua
+++ b/src/luatexja/otf.lua
@@ -30,6 +30,10 @@ local attr_jchar_class = luatexbase.attributes['ltj@charclass']
 local attr_yablshift = luatexbase.attributes['ltj@yablshift']
 local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
 
+local ltjf_font_metric_table = ltjf.font_metric_table
+local ltjf_find_char_class = ltjf.find_char_class
+
+
 -- Append a whatsit node to the list.
 -- This whatsit node will be extracted to a glyph_node
 function append_jglyph(char)
@@ -50,7 +54,7 @@ function cid(key)
    end
    local char = curjfnt.unicodes['Japan1.'..tostring(key)]
    if not char then
-      ltjb.package_error('luatexja-otf',
+      ltjb.package_warning('luatexja-otf',
                          'Current Japanese font "'..curjfnt.psname..'" does not include the specified CID character ('..tostring(key)..')', 
                          'Use a font including the specified CID character.')
       return
@@ -67,7 +71,7 @@ function extract(head)
            g.subtype = 0; g.char = p.value
            v = has_attr(p, attr_curjfnt); g.font = v
            set_attr(g, attr_jchar_class,
-                    ltjf.find_char_class(g.char, ltjf.font_metric_table[v].jfm))
+                    ltjf_find_char_class(g.char, ltjf_font_metric_table[v]))
            set_attr(g, attr_curjfnt, v)
            v = has_attr(p, attr_yablshift)
            if v then 
@@ -95,5 +99,46 @@ luatexbase.add_to_callback('pre_linebreak_filter',
                                   'ltj.pre_linebreak_filter'))
 
 
+-- additional callbacks
+-- 以下は，LuaTeX-ja に用意された callback のサンプルになっている．
+--   JFM の文字クラスの指定の所で，"AJ1-xxx" 形式での指定を可能とした．
+--   これらの文字指定は，和文フォント定義ごとに，それぞれのフォントの
+--   CID <-> グリフ 対応状況による変換テーブルが用意される．
+
+-- フォント読み込み時に，CID
+local function cid_to_char(fmtable, fn)
+   local fi = fonts.ids[fn]
+   if fi.cidinfo and fi.cidinfo.ordering == "Japan1" then
+      fmtable.cid_char_type = {}
+      for i, v in pairs(ltjf.metrics[fmtable.jfm].chars) do
+        local j = string.match(i, "^AJ1%-([0-9]*)")
+        if j then
+           j = tonumber(fi.unicodes['Japan1.'..tostring(j)])
+           if j then
+              fmtable.cid_char_type[j] = v 
+           end
+        end
+      end
+   end
+   return fmtable
+end
+luatexbase.add_to_callback("luatexja.define_jfont", 
+                          cid_to_char, "ltj.otf.define_jfont", 1)
+--  既に読み込まれているフォントに対しても，同じことをやらないといけない
+for fn, v in pairs(ltjf_font_metric_table) do
+   ltjf_font_metric_table[fn] = cid_to_char(v, fn)
+end
+
+
+local function cid_set_char_class(arg, fmtable, char)
+   if arg~=0 then return arg
+   elseif fmtable.cid_char_type then 
+      return fmtable.cid_char_type[char] or 0
+   else return 0
+   end
+end
+luatexbase.add_to_callback("luatexja.find_char_class", 
+                          cid_set_char_class, "ltj.otf.find_char_class", 1)
+
 -------------------- all done
 -- EOF