X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-compat.lua;h=bd798545f3f30386b4478f014df771c60c9863a9;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=98452de9caa93333dc4c58b08c9cd190d64608d1;hpb=745d0f80115b7401a87fc8fa0318d539016272b9;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-compat.lua b/src/ltj-compat.lua
index 98452de..bd79854 100644
--- a/src/ltj-compat.lua
+++ b/src/ltj-compat.lua
@@ -18,15 +18,16 @@ end
 
 
 -- \kuten, \jis, \euc, \sjis, \ucs, \kansuji
+local utfchar=utf.char
 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(luatexja.stack_table_index.KSJ + num%10,
+      s = utfchar(
+	 ltjs.get_stack_table(luatexja.stack_table_index.KSJ + num%10,
 				'', tex.getcount('ltj@@stack'))) .. s
       num=math.floor(num/10)
    end
@@ -35,34 +36,34 @@ end
 
 -- \ucs: 単なる identity
 local function from_ucs(i)
-   if type(i)~='number' then 
+   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 
+      i=0
    end
    tex.write(i)
 end
 
 -- \kuten: 面区点 （それぞれで16進2桁を使用）=> Unicode 符号位置
 local function from_kuten(i)
-   if type(i)~='number' then 
+   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 
+      i=0
    end
    tex.write(tostring(jisx0208.table_jisx0208_uptex[i] or 0))
 end
 
 -- \euc: EUC-JP による符号位置 => Unicode 符号位置
 local function from_euc(i)
-   if type(i)~='number' then 
+   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 
+   elseif i>=0x10000 or i<0xa0a0 then
       i=0
    end
    from_kuten(i-0xa0a0)
@@ -70,7 +71,7 @@ end
 
 -- \jis: ISO-2022-JP による符号位置 => Unicode 符号位置
 local function from_jis(i)
-   if (type(i)~='number') or i>=0x10000 or i<0 then 
+   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.")
@@ -81,19 +82,19 @@ end
 
 -- \sjis: Shift_JIS による符号位置 => Unicode 符号位置
 local function from_sjis(i)
-   if (type(i)~='number') or i>=0x10000 or i<0 then 
+   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 
+      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
@@ -110,7 +111,7 @@ local function from_sjis(i)
 	if c1>0x7f then i=0x40 else i=0x3f end
 	c1 = c1 - i
      else
-	c1 = c1 - 0x7e
+	c1 = c1 - 0x9e
      end
      from_kuten(c2*256+c1)
   end
@@ -124,7 +125,7 @@ luatexja.binary_pars.kansujichar = function(c, t)
 			    'So I changed this one to zero.')
       c=0
    end
-   return ltjs.get_penalty_table(stack_table_index.KSJ + c, 0, t)
+   return ltjs.get_stack_table(stack_table_index.KSJ + c, 0, t)
 end