X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.lua;h=9a09db9e68cdd786addd8560b2c589cd25bcf9bf;hb=79acad85e3b942cd4fe555c40886ad295b487fce;hp=83bfed33b5659cb34eda1b022da6d51bfe6772a7;hpb=3cc726959efc64921a3d1ed2ae1b5dbf40cf2cbe;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 83bfed3..9a09db9 100644
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -1,6 +1,4 @@
 
-local floor = math.floor
-
 require('lualibs')
 
 ------------------------------------------------------------------------
@@ -8,26 +6,13 @@ require('lualibs')
 --    ext_... : called from \directlua{}
 --    int_... : called from other Lua codes, but not from \directlua{}
 --    (other)     : only called from this file
-function luatexja.error(s,t)
-   tex.error('LuaTeX-ja error: ' .. s ,t) 
-end
 function luatexja.load_module(name)
-   if not package.loaded['luatexja.' .. name] then
-      local fn = 'ltj-' .. name .. '.lua'
-      local found = kpse.find_file(fn, 'tex')
-      if not found then
-	 luatexja.error("File `" .. fn .. "' not found", 
-			{'This file ' .. fn .. ' is required for LuaTeX-ja.', 'Please check your installation.'})
-      else 
-	 texio.write_nl('(' .. found .. ')')
-	 dofile(found)
-      end
-   end
+   require('ltj-' .. name.. '.lua')
 end
 function luatexja.load_lua(fn)
    local found = kpse.find_file(fn, 'tex')
    if not found then
-      error("File `" .. fn .. "' not found")
+      tex.error("LuaTeX-ja error: File `" .. fn .. "' not found")
    else 
       texio.write_nl('(' .. found .. ')')
       dofile(found)
@@ -64,11 +49,10 @@ stack_table_index.KSJ  = 0x400 -- 0--9
 
 local userid_table = {}
 luatexja.userid_table = userid_table
-userid_table.IHB  = 30111 -- \inhibitglue
-userid_table.STCK = 30112 -- スタック管理
-userid_table.OTF  = 30113 -- luatexja-otf
-userid_table.BPAR = 30114 -- 「段落始め」
-
+userid_table.IHB  = luatexbase.newuserwhatsitid('inhibitglue',  'luatexja') -- \inhibitglue
+userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- スタック管理
+userid_table.OTF  = luatexbase.newuserwhatsitid('char_by_cid',  'luatexja') -- luatexja-otf
+userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par',    'luatexja') -- 「段落始め」
 
 --- 定義終わり
 
@@ -85,28 +69,6 @@ load_module('setwidth');  local ltjw = luatexja.setwidth
 load_module('math');      local ltjm = luatexja.math
 load_module('tangle');    local ltjb = luatexja.base
 
-
-local node_type = node.type
-local node_new = node.new
-local node_prev = node.prev
-local node_next = node.next
-local has_attr = node.has_attribute
-local node_insert_before = node.insert_before
-local node_insert_after = node.insert_after
-local node_hpack = node.hpack
-
-local id_penalty = node.id('penalty')
-local id_glyph = node.id('glyph')
-local id_glue_spec = node.id('glue_spec')
-local id_glue = node.id('glue')
-local id_kern = node.id('kern')
-local id_hlist = node.id('hlist')
-local id_vlist = node.id('vlist')
-local id_rule = node.id('rule')
-local id_math = node.id('math')
-local id_whatsit = node.id('whatsit')
-local sid_user = node.subtype('user_defined')
-
 local attr_jchar_class = luatexbase.attributes['ltj@charclass']
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 local attr_yablshift = luatexbase.attributes['ltj@yablshift']
@@ -114,8 +76,15 @@ local attr_icflag = luatexbase.attributes['ltj@icflag']
 local attr_uniqid = luatexbase.attributes['ltj@uniqid']
 local cat_lp = luatexbase.catcodetables['latex-package']
 
+
+---- table: charprop_stack_table [stack_level].{pre|post|xsp}[chr_code]
+
+
 -- Three aux. functions, bollowed from tex.web
+
 local unity=65536
+local floor = math.floor
+
 local function print_scaled(s)
    local out=''
    local delta=10
@@ -146,7 +115,7 @@ local function print_glue(d,order)
    return out
 end
 
-function print_spec(p)
+local function print_spec(p)
    local out=print_scaled(p.width)..'pt'
    if p.stretch~=0 then
       out=out..' plus '..print_glue(p.stretch,p.stretch_order)
@@ -158,8 +127,6 @@ return out
 end
 
 
----- table: charprop_stack_table [stack_level].{pre|post|xsp}[chr_code]
-
 ------------------------------------------------------------------------
 -- CODE FOR GETTING/SETTING PARAMETERS 
 ------------------------------------------------------------------------
@@ -213,11 +180,11 @@ function luatexja.ext_get_parameter_binary(k,c)
       c=0
    end
    if k == 'jacharrange' then
-      if c>=7*ltjc.ATTR_RANGE then 
+      if c>=31*ltjc.ATTR_RANGE then 
 	 ltjb.package_error('luatexja',
 			    'invalid character range number (' .. c .. ')',
 			    'A character range number should be in the range 0..'
-                               .. 7+ATTR_RANGE-1 .. ",\n"..
+                               .. 31*ltjc.ATTR_RANGE-1 .. ",\n"..
 			     'So I changed this one to zero.')
 	 c=0
       end
@@ -267,15 +234,50 @@ luatexbase.add_to_callback('pre_linebreak_filter',
       return main_process(head, true, tex.textdir)
    end,'ltj.pre_linebreak_filter',
    luatexbase.priority_in_callback('pre_linebreak_filter',
-				   'luaotfload.pre_linebreak_filter') + 1)
+				   'luaotfload.node_processor') + 1)
 luatexbase.add_to_callback('hpack_filter', 
   function (head,groupcode,size,packtype, dir)
      return main_process(head, false, dir)
   end,'ltj.hpack_filter',
    luatexbase.priority_in_callback('hpack_filter',
-				   'luaotfload.hpack_filter') + 1)
+				   'luaotfload.node_processor') + 1)
+
+-- define_font
+
+local otfl_fdr = fonts.definers.read
+function luatexja.font_callback(name, size, id)
+  return ltjf.font_callback(
+     name, size, id, 
+     function (name, size, id) return ltjr.font_callback(name, size, id, otfl_fdr) end
+  )
+end
+--luatexbase.remove_from_callback('define_font',"luaotfload.define_font")
+luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
+
+
+
+
 
 -- debug
+
+do
+
+local node_type = node.type
+local node_next = node.next
+local has_attr = node.has_attribute
+
+local id_penalty = node.id('penalty')
+local id_glyph = node.id('glyph')
+local id_glue_spec = node.id('glue_spec')
+local id_glue = node.id('glue')
+local id_kern = node.id('kern')
+local id_hlist = node.id('hlist')
+local id_vlist = node.id('vlist')
+local id_rule = node.id('rule')
+local id_math = node.id('math')
+local id_whatsit = node.id('whatsit')
+local sid_user = node.subtype('user_defined')
+
 local function get_attr_icflag(p)
    return (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG
 end
@@ -412,4 +414,6 @@ function luatexja.ext_show_node(head,depth,print_fn)
    else
       print_fn(debug_depth .. ' (null list)')
    end
-end
\ No newline at end of file
+end
+
+end