forgot to remove debug code

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

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 5becb54..a0425d7 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -65,9 +65,11 @@ luatexja.dir_table = dir_table
 dir_table.dir_dtou = 1
 dir_table.dir_tate = 3
 dir_table.dir_yoko = 4
-dir_table.dir_utod = 11 -- 「縦数式ディレクション」 in pTeX
+dir_table.dir_math_mod    = 8 -- 組方向を合わせるために自動で作られたもの
 dir_table.dir_node_auto   = 128 -- 組方向を合わせるために自動で作られたもの
 dir_table.dir_node_manual = 256 -- 寸法代入によって作られたもの
+dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod
+   -- 「縦数式ディレクション」 in pTeX
 
 
 ------------------------------------------------------------------------
@@ -117,32 +119,15 @@ load_module('rmlgbm');    local ltjr = luatexja.rmlgbm -- must be 1st
 if luatexja_debug then load_module('debug') end
 
 load_module('charrange'); local ltjc = luatexja.charrange
+load_module('stack');     local ltjs = luatexja.stack
+load_module('direction'); local ltjd = luatexja.direction
 load_module('jfont');     local ltjf = luatexja.jfont
-
--- define_font
-do
-   local otfl_fdr = fonts.definers.read
-   local ltjr_font_callback = ltjr.font_callback
-   local ltjf_extract_metric = ltjf.extract_metric
-   function luatexja.font_callback(name, size, id)
-      local new_name = ltjf_extract_metric(name)
-      local res =  ltjr_font_callback(new_name, size, id, otfl_fdr)
-      luatexbase.call_callback('luatexja.define_font', res, new_name, size, id)
-      return res
-   end
-   luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end)
-   luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
-end
-
-
 load_module('inputbuf');  local ltji = luatexja.inputbuf
-load_module('stack');     local ltjs = luatexja.stack
 load_module('pretreat');  local ltjp = luatexja.pretreat
 load_module('jfmglue');   local ltjj = luatexja.jfmglue
 load_module('setwidth');  local ltjw = luatexja.setwidth
 load_module('math');      local ltjm = luatexja.math
 load_module('tangle');    local ltjb = luatexja.base
-load_module('direction'); local ltjd = luatexja.direction
 
 local attr_jchar_class = luatexbase.attributes['ltj@charclass']
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
@@ -245,7 +230,13 @@ do
         end
         return r
       end,
-      direction = ltjd.get_dir_count,
+      direction = function() 
+        local v = ltjd.get_dir_count()
+        if math.abs(tex.nest[tex.nest.ptr].mode) == ltjs.mmode and v == dir_table.dir_tate then
+           v = dir_table.dir_utod
+        end
+        return v
+      end,
       adjustdir = ltjd.get_adjust_dir_count,
    }