Fix: replacement by IVS was overwritten by that by font features.

diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua
index e9265e2..e36a197 100644 (file)
--- a/src/ltj-otf.lua
+++ b/src/ltj-otf.lua
@@ -289,24 +289,36 @@ do
    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)
+   local function ivs_jglyph(char, bp, pf)
+      local p = node_new(id_whatsit,sid_user)
+      p.user_id=OTF; p.type=100; p.value=char
+      set_attr(p, attr_curjfnt, pf)
+      set_attr(p, attr_yablshift, has_attr(bp, attr_ykblshift) or 0)
+      return p
    end
+
    local function do_ivs_repr(head)
       local p = head
       while p do
         local pid = p.id
         if pid==id_glyph then
-           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
+            local pf = p.font
+            if (has_attr(p, attr_curjfnt) or 0) == pf  then
+               -- only works with JAchars
+               local pt = font_ivs_table[pf]
+               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]
+                     head = node_remove(head,q)
+                     if pt then
+                        local np = ivs_jglyph(pt, p, pf)
+                        head = node_insert_after(head, p, np) 
+                        head = node_remove(head,p)
+                        p = np
+                     end
                   end
-                  head = node_remove(head,q)
                end
             end
          end

diff --git a/test/test19-ivs.pdf b/test/test19-ivs.pdf
index c5d4d62..2a1fa73 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 8399ee2..c1bc5ad 100644 (file)
--- a/test/test19-ivs.tex
+++ b/test/test19-ivs.tex
@@ -103,4 +103,18 @@ IPA MJ 明朝\par\medskip
 \bottomrule
 \end{tabular}
 \end{center}
+
+\newpage
+\def\TEST{%
+  奈良県葛󠄀城市と東京都葛󠄁飾区．%
+  江戸川区葛西はどっち？
+}
+
+
+\begin{quote}
+ \Large
+ {\jfontspec{KozMinPr6N-Regular}\TEST}\\
+ {\jfontspec[CJKShape=JIS1978]{KozMinPr6N-Regular}\TEST}\\
+ {\jfontspec[CJKShape=JIS1990]{KozMinPr6N-Regular}\TEST}
+\end{quote}
 \end{document}
\ No newline at end of file