X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-compat.lua;h=bc8ac9d6795acc6964dafb877e8c40ed37a4d1a0;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=d72cce3313c36754b76d3dfe481ec62ef1b40650;hpb=6e672f2c6c4c966166ec272a021b0f3afa93bee0;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-compat.lua b/src/ltj-compat.lua
index d72cce3..bc8ac9d 100644
--- a/src/ltj-compat.lua
+++ b/src/ltj-compat.lua
@@ -1,28 +1,32 @@
 --
--- luatexja/compat.lua
+-- luatexja/ltj-compat.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.compat',
-  date = '2011/06/03',
-  version = '0.1',
-  description = 'Partial implementation of primitives of pTeX',
-})
-module('luatexja.compat', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
 
-luatexja.load_module('base');      local ltjb = luatexja.base
-luatexja.load_module('stack');     local ltjs = luatexja.stack
+luatexja.load_module('base');   local ltjb = luatexja.base
+luatexja.load_module('stack');  local ltjs = luatexja.stack
+local stack_table_index = luatexja.stack_table_index
+
+-- load jisx0208 table
+local cache_ver = 2
+
+local cache_outdate_fn = function (t) return t.version~=cache_ver end
+local jisx0208 = ltjb.load_cache('ltj-jisx0208',cache_outdate_fn)
+if not jisx0208 then -- make cache
+   jisx0208 = require('ltj-jisx0208.lua')
+   ltjb.save_cache_luc('ltj-jisx0208', jisx0208)
+end
+
 
 -- \kuten, \jis, \euc, \sjis, \ucs, \kansuji
-function to_kansuji(num)
+local function to_kansuji(num)
    if not num then num=0; return
-   elseif num<0 then 
+   elseif num<0 then
       num = -num; tex.write('-')
    end
    local s = ""
    while num~=0 do
       s = utf.char(
-	 ltjs.get_penalty_table('ksj', num%10,
+	 ltjs.get_stack_table(luatexja.stack_table_index.KSJ + num%10,
 				'', tex.getcount('ltj@@stack'))) .. s
       num=math.floor(num/10)
    end
@@ -30,45 +34,66 @@ function to_kansuji(num)
 end
 
 -- \ucs: 単なる identity
-function from_ucs(i)
+local function from_ucs(i)
+   if type(i)~='number' then
+      ltjb.package_error('luatexja',
+			 "invalid character code (".. tostring(i) .. ")",
+			 "I'm going to use 0 instead of that illegal character code.")
+      i=0
+   end
    tex.write(i)
 end
 
 -- \kuten: 面区点 （それぞれで16進2桁を使用）=> Unicode 符号位置
-function from_kuten(i)
-   if not i then i=0 end
-   tex.write(tostring(luatexja.jisx0208.table_jisx0208_uptex[i] or 0))
+local function from_kuten(i)
+   if type(i)~='number' then
+      ltjb.package_error('luatexja',
+			 "invalid character code (".. tostring(i) .. ")",
+			 "I'm going to use 0 instead of that illegal character code.")
+      i=0
+   end
+   tex.write(tostring(jisx0208.table_jisx0208_uptex[i] or 0))
 end
 
 -- \euc: EUC-JP による符号位置 => Unicode 符号位置
-function from_euc(i)
-   if not i then i=0
-   elseif i>=0x10000 or i<0xa0a0 then 
+local function from_euc(i)
+   if type(i)~='number' then
+      ltjb.package_error('luatexja',
+			 "invalid character code (".. tostring(i) .. ")",
+			 "I'm going to use 0 instead of that illegal character code.")
+      i=0
+   elseif i>=0x10000 or i<0xa0a0 then
       i=0
    end
    from_kuten(i-0xa0a0)
 end
 
 -- \jis: ISO-2022-JP による符号位置 => Unicode 符号位置
-function from_jis(i)
-   if (not i) or i>=0x10000 or i<0 then 
+local function from_jis(i)
+   if (type(i)~='number') or i>=0x10000 or i<0 then
+      ltjb.package_error('luatexja',
+			 "invalid character code (".. tostring(i) .. ")",
+			 "I'm going to use 0 instead of that illegal character code.")
       i=0
    end
    from_kuten(i-0x2020)
 end
 
 -- \sjis: Shift_JIS による符号位置 => Unicode 符号位置
-function from_sjis(i)
-   if (not i) or i>=0x10000 or i<0 then 
-      tex.write('0'); return 
+local function from_sjis(i)
+   if (type(i)~='number') or i>=0x10000 or i<0 then
+      ltjb.package_error('luatexja',
+			 "invalid character code (".. tostring(i) .. ")",
+			 "I'm going to use 0 instead of that illegal character code.")
+      tex.write('0'); return
    end
    local c2 = math.floor(i/256)
    local c1 = i%256
    local shift_jisx0213_s1a3_table = {
-      { [false]= 1, [true]= 8}, 
-      { [false]= 3, [true]= 4}, 
-      { [false]= 5, [true]=12}, 
-      { [false]=13, [true]=14}, 
+      { [false]= 1, [true]= 8},
+      { [false]= 3, [true]= 4},
+      { [false]= 5, [true]=12},
+      { [false]=13, [true]=14},
       { [false]=15 } }
    if c2 >= 0x81 then
       if c2 >= 0xF0 then -- this if block won't be true
@@ -90,3 +115,25 @@ function from_sjis(i)
      from_kuten(c2*256+c1)
   end
 end
+
+luatexja.binary_pars.kansujichar = function(c, t)
+   if type(c)~='number' or c<0 or c>9 then
+      ltjb.package_error('luatexja',
+			 'Invalid KANSUJI number (' .. tostring(c) .. ')',
+			 'A KANSUJI number should be in the range 0..9.\n'..
+			    'So I changed this one to zero.')
+      c=0
+   end
+   return ltjs.get_stack_table(stack_table_index.KSJ + c, 0, t)
+end
+
+
+local t = {
+   from_euc   = from_euc,
+   from_kuten = from_kuten,
+   from_jis   = from_jis,
+   from_sjis  = from_sjis,
+   from_ucs   = from_ucs,
+   to_kansuji = to_kansuji,
+}
+luatexja.compat = t