Changed the character class of ` ' (U+3000 Ideographic Space) to zero

[luatex-ja/luatexja.git] / src / ltj-jfmglue.lua

diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua
index 84e1100..4091073 100644 (file)
--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -568,7 +568,7 @@ do
    function set_np_xspc_jachar_yoko(Nx, x)
       local m = ltjf_font_metric_table[getfont(x)]
       local cls, c = slow_find_char_class(ltjs_orig_char_table[x], m, getchar(x))
-      Nx.met = m; Nx.class = cls
+      Nx.met, Nx.class, Nx.char = m, cls, c;
       if cls~=0 then set_attr(x, attr_jchar_class, cls) end
       Nx.pre  = table_current_stack[PRE + c]  or 0
       Nx.post = table_current_stack[POST + c] or 0
@@ -582,7 +582,7 @@ do
       local m = ltjf_font_metric_table[xf]
       local cls = slow_find_char_class(c, m, c_glyph)
       --setfield(x, 'char', ltjf_get_vert_glyph(xf, c_glyph) or c_glyph)
-      Nx.met = m; Nx.class = cls;
+      Nx.met, Nx.class, Nx.char = m, cls, c;
       if cls~=0 then set_attr(x, attr_jchar_class, cls) end
       Nx.pre  = table_current_stack[PRE + c]  or 0
       Nx.post = table_current_stack[POST + c] or 0
@@ -593,7 +593,7 @@ do
    function set_np_xspc_jachar_hbox(Nx, x)
       local m = ltjf_font_metric_table[getfont(x)]
       local c = getchar(x)
-      Nx.met = m; Nx.class = has_attr(x, attr_jchar_class) or 0;
+      Nx.met, Nx.char  = m, c; Nx.class = has_attr(x, attr_jchar_class) or 0;
       Nx.pre  = table_current_stack[PRE + c]  or 0
       Nx.post = table_current_stack[POST + c] or 0
       Nx.xspc = table_current_stack[XSP  + c] or 3
@@ -1181,11 +1181,13 @@ do
        if not s and getfield(Nq.nuc, 'user_id') == BPAR then
          local x, y = node_prev(Nq.nuc), Nq.nuc
          Nq.first, Nq.nuc, Nq.last = x, x, x
-         if Np.met then
-            Nq.class = fast_find_char_class('parbdd', Np.met)
+         if Np then
+            if Np.met then
+               Nq.class = fast_find_char_class('parbdd', Np.met)
+            end
+            Nq.met = Np.met; Nq.pre = 0; Nq.post = 0; Nq.xspc = 0
+            Nq.auto_xspc = false
          end
-         Nq.met = Np.met; Nq.pre = 0; Nq.post = 0; Nq.xspc = 0
-         Nq.auto_xspc = false
          head = node_remove(head, y)
         node_free(y)
       end