Fix ticket #33832

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

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 98b54c1..080cf89 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -47,12 +47,11 @@ local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
 local ltjd_get_vert_glyph = ltjd.get_vert_glyph
 local ltjf_replace_altfont = ltjf.replace_altfont
 local attr_orig_char = luatexbase.attributes['ltj@origchar']
-local STCK = luatexja.userid_table.STCK
-local DIR = luatexja.userid_table.DIR
+local STCK  = luatexja.userid_table.STCK
+local DIR   = luatexja.userid_table.DIR
 local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
 
-local dir_tate = 3
-local dir_yoko = 4
+local dir_tate = luatexja.dir_table.dir_tate
 
 ------------------------------------------------------------------------
 -- MAIN PROCESS STEP 1: replace fonts
@@ -84,11 +83,9 @@ do
             wt[#wt+1] = p; head = node_remove(head, p)
          elseif uid==DIR then
            if has_attr(p, attr_icflag)<PROCESSED_BEGIN_FLAG  then
-              ltjs.list_dir = getfield(p, 'value')
-           else
-              local q
-              wtd[#wtd+1] = p; head, q = node_remove(head, p)
+              ltjs.list_dir = has_attr(p, attr_dir)
            end
+           wtd[#wtd+1] = p; head = node_remove(head, p)
          end
       end
       return p