X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-base.lua;h=f5535d65c67f28a5c8d8b87133233ceadf29894c;hb=eb118f3e5ea0852407b5261817700401699528b9;hp=46d7c898efd64a21c7617d2b466c0d46a2817be6;hpb=2b3abd97c607a1a2c62ae9b0e726d5fe6573caca;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-base.lua b/src/ltj-base.lua
index 46d7c89..f5535d6 100644
--- a/src/ltj-base.lua
+++ b/src/ltj-base.lua
@@ -8,9 +8,14 @@ local node, table, tex, token = node, table, tex, token
 local cat_lp = luatexbase.catcodetables['latex-package']
 
 -------------------- 
+local ltjb = {}
+luatexja.base = ltjb
 
 local public_name = 'luatexja'
 local public_version = 'alpha'
+ltjb.public_name = public_name
+ltjb.public_version = public_version
+
 
 -------------------- Fully-expandable error messaging
 local _error_set_break, _error_set_message, _error_show
@@ -146,10 +151,9 @@ local function mprint(...)
    end
    return tex.print(unpack(lines))
 end
+ltjb.mprint = mprint
 
 -------------------- Handling of TeX values
-local to_dimen, to_skip, dump_skip 
-
 do
 
   local glue_spec_id = node.id("glue_spec")
@@ -167,7 +171,7 @@ do
   end
 
 --! ixbase.to_dimen() と同じ
-  to_dimen = function (val)
+  local function to_dimen(val)
     if val == nil then
       return 0
     elseif type(val) == "number" then
@@ -189,7 +193,7 @@ do
   end
 
 --! ixbase.to_skip() と同じ
-  to_skip = function (val)
+  local function to_skip(val)
     if type(val) == "userdata" then
       return val
     end
@@ -207,26 +211,29 @@ do
         p, m = nil, t[3]
       end
       res.width = tex.sp(t[1])
-      if t[3] then
-        res.stretch, res.stretch_order = parse_dimen(t[3])
+      if p then
+        res.stretch, res.stretch_order = parse_dimen(p)
       end
-      if t[5] then
-        res.shrink, res.shrink_order = parse_dimen(t[5])
+      if m then
+        res.shrink, res.shrink_order = parse_dimen(m)
       end
     end
     return res
   end
 
-  dump_skip = function (s)
+  local function dump_skip(s)
     print(("%s+%s<%s>-%s<%s>"):format(
       s.width or 0, s.stretch or 0, s.stretch_order or 0,
       s.shrink or 0, s.shrink_order or 0))
   end
 
+  ltjb.to_dimen = to_dimen
+  ltjb.dump_skip = dump_skip
+  ltjb.to_skip = to_skip
 end
--------------------- Virtual table for LaTeX counters
-local counter
 
+-------------------- Virtual table for LaTeX counters
+-- not used in current LuaTeX-ja
 do
 --! ixbase.counter と同じ
   counter = {}
@@ -239,13 +246,12 @@ do
   function mt_counter.__newindex(tbl, key, val)
     tex.count['c@'..key] = val
   end
+  ltjb.counter = counter
 
 --! ixbase.length は tex.skip と全く同じなので不要.
 end
 
 -------------------- Number handling in TeX source
-local scan_brace, scan_number 
-
 do
 
   local tok_escape = token.create("ltj@@q@escape")
@@ -338,7 +344,7 @@ do
     ltb.add_to_callback("token_filter", proc, "ltj@grab@num", 1)
   end
 
-  scan_brace = function ()
+  local function scan_brace()
     scan_with(1, function()
       local next = token.get_next()
       if next[1] == 1 then
@@ -351,7 +357,7 @@ do
     end)
   end
 
-  scan_number = function ()
+  local function scan_number()
     scan_with(1, function()
       local next = get_expd_next()
       local res, ok = { tok_num }, false
@@ -386,9 +392,12 @@ do
     end)
   end
 
+  ltjb.scan_brace = scan_brace
+  ltjb.scan_number = scan_number
 end
+
 -------------------- TeX register allocation
-local const_number, count_number, attribute_number, dimen_number, skip_number
+-- not used in current LuaTeX-ja
 
 do
   local cmod_base_count = token.create('ltj@@count@zero')[2]
@@ -396,43 +405,36 @@ do
   local cmod_base_dimen = token.create('ltj@@dimen@zero')[2]
   local cmod_base_skip = token.create('ltj@@skip@zero')[2]
 
-  const_number = function (name)
+  local function const_number(name)
     if name:sub(1, 1) == '\\' then name = name:sub(2) end
     return token.create(name)[2]
   end
 
-  count_number = function (name)
+  local function count_number(name)
     if name:sub(1, 1) == '\\' then name = name:sub(2) end
     return token.create(name)[2] - cmod_base_count
   end
 
-  attribute_number = function (name)
+  local function attribute_number(name)
     if name:sub(1, 1) == '\\' then name = name:sub(2) end
     return token.create(name)[2] - cmod_base_attr
   end
 
-  dimen_number = function (name)
+  local function dimen_number(name)
     if name:sub(1, 1) == '\\' then name = name:sub(2) end
     return token.create(name)[2] - cmod_base_dimen
   end
 
-  skip_number = function (name)
+  local function skip_number(name)
     if name:sub(1, 1) == '\\' then name = name:sub(2) end
     return token.create(name)[2] - cmod_base_skip
   end
 
-end
--------------------- mock of debug logger
-
-if not debug or debug == _G.debug then
-  local function no_op() end
-  debug = no_op
-  package_debug = no_op
-  show_term = no_op
-  show_log = no_op
-  function debug_logger()
-    return no_op
-  end
+  ltjb.const_number = const_number
+  ltjb.count_number = count_number
+  ltjb.attribute_number = attribute_number
+  ltjb.dimen_number = dimen_number
+  ltjb.skip_number = skip_number
 end
 
 -------------------- getting next token
@@ -441,7 +443,25 @@ local function get_cs(s)
    cstemp = token.csname_name(token.get_next())
    tex.sprint(cat_lp,'\\' .. s)
 end
+ltjb.get_cs = get_cs
 
+-------------------- common error message
+do
+   local function in_unicode(c, admit_math)
+      local low = admit_math and -1 or 0
+      if type(c)~='number' or c<low or c>0x10FFFF then
+	 local s = 'A character number must be between ' .. tostring(low) 
+	    .. ' and 0x10ffff.\n'
+	    .. (admit_math and "(-1 is used for denoting `math boundary')\n" or '')
+	    .. 'So I changed this one to zero.'
+	 package_error('luatexja',
+			    'bad character code (' .. tostring(c) .. ')', s)
+	 c=0
+      end
+      return c
+   end
+   ltjb.in_unicode = in_unicode
+end
 
 -------------------- cache management
 -- load_cache (filename, outdate)
@@ -457,8 +477,6 @@ end
 require('lualibs-lpeg') -- string.split
 require('lualibs-os')   -- os.type
 
-local load_cache, save_cache_luc, save_cache
-
 do
    local kpse_var_value = kpse.var_value
    local path, pathtmp = kpse_var_value("TEXMFVAR")
@@ -468,7 +486,7 @@ do
    if pathtmp then path = (path and path .. ';' or '') .. pathtmp end
 
    if os.type~='windows' then path = string.gsub(path, ':', ';') end
-   path = string.split(path, ';')
+   path = table.unique(string.split(path, ';'))
 
    local cache_dir = '/luatexja'
    local find_file = kpse.find_file
@@ -528,6 +546,7 @@ do
 	 return result 
       end
    end
+   
    load_cache = function (filename, outdate)
       local r = load_cache_a(filename ..  luc_suffix, outdate)
       if r then 
@@ -539,62 +558,53 @@ do
       end
    end
 
+   ltjb.load_cache = load_cache
+   ltjb.save_cache_luc = save_cache_luc
+   ltjb.save_cache = save_cache
+end
+
+----
+do
+   local tex_set_attr, tex_get_attr = tex.setattribute, tex.getattribute
+   function ltjb.ensure_tex_attr(a, v)
+      if tex_get_attr(a)~=v then
+	 tex_set_attr(a, v)
+      end
+   end
 end
+----
 
+ltjb._error_set_break = _error_set_break
+ltjb._error_set_message = _error_set_message
+ltjb._error_show = _error_show
+ltjb._generic_warn_info = _generic_warn_info
+
+ltjb.package_error = package_error
+ltjb.package_warning = package_warning
+ltjb.package_warning_no_line = package_warning_no_line
+ltjb.package_info = package_info
+ltjb.package_info_no_line = package_info_no_line
+
+ltjb.generic_error = generic_error
+ltjb.generic_warning = generic_warning
+ltjb.generic_warning_no_line = generic_warning_no_line
+ltjb.generic_info = generic_info
+ltjb.generic_info_no_line = generic_info_no_line
+
+ltjb.ltj_warning_no_line = ltj_warning_no_line
+ltjb.ltj_error = ltj_error
+
+-------------------- mock of debug logger
+if not ltjb.out_debug then
+   local function no_op() end
+   ltjb.start_time_measure = no_op
+   ltjb.stop_time_measure = no_op
+   ltjb.out_debug = no_op
+   ltjb.package_debug = no_op
+   ltjb.debug_logger = function() return no_op end
+   ltjb.show_term = no_op
+   ltjb.show_log = no_op
+end
 
-luatexja.base = {
-   public_name = public_name, 
-   public_version = public_version, 
-   --
-   _error_set_break = _error_set_break, 
-   _error_set_message = _error_set_message, 
-   _error_show = _error_show, 
-   _generic_warn_info = _generic_warn_info, 
-   --
-   package_error = package_error, 
-   package_warning = package_warning, 
-   package_warning_no_line = package_warning_no_line, 
-   package_info = package_info, 
-   package_info_no_line = package_info_no_line, 
-   --
-   generic_error = generic_error, 
-   generic_warning = generic_warning, 
-   generic_warning_no_line = generic_warning_no_line, 
-   generic_info = generic_info, 
-   generic_info_no_line = generic_info_no_line, 
-   --
-   ltj_warning_no_line = ltj_warning_no_line, 
-   ltj_error = ltj_error, 
-   --
-   mprint = mprint, 
-   --
-   to_dimen = to_dimen, 
-   dump_skip = dump_skip, 
-   to_skip = to_skip, 
-   --
-   counter = counter, 
-   --
-   scan_brace = scan_brace, 
-   scan_number = scan_number, 
-   --
-   const_number = const_number, 
-   count_number = count_number, 
-   attribute_number = attribute_number, 
-   dimen_number = dimen_number, 
-   skip_number = skip_number, 
-   --
-   get_cs = get_cs, 
-   --
-   load_cache = load_cache, 
-   save_cache_luc = save_cache_luc, 
-   save_cache = save_cache, 
-   --
-   debug = debug, 
-   package_debug = package_debug, 
-   debug_logger = debug_logger, 
-   show_term = show_term, 
-   show_log = show_log, 
-   --
-}
 -------------------- all done
 -- EOF