diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua')
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua | 87 |
1 files changed, 34 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua index c8e046c63da..d660915a31a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua @@ -2,8 +2,8 @@ -- ltj-compat.lua -- -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 @@ -12,7 +12,7 @@ local cache_ver = 3 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') + jisx0208 = require 'ltj-jisx0208.lua' ltjb.save_cache_luc('ltj-jisx0208', jisx0208) end @@ -22,39 +22,35 @@ local utfchar=utf.char local function to_kansuji(num) if not num then num=0; return elseif num<0 then - num = -num; tex.write('-') + num = -num; tex.write '-' end local s = "" while num~=0 do s = utfchar( - ltjs.get_stack_table(luatexja.stack_table_index.KSJ + num%10, - '', tex.getcount('ltj@@stack'))) .. s + ltjs.get_stack_table(luatexja.stack_table_index.KSJ + num%10, + '', tex.getcount 'ltj@@stack')) .. s num=math.floor(num/10) end tex.write(s) end +local function error_invalid_charcode(i) + ltjb.package_error('luatexja', + "invalid character code (".. tostring(i) .. ")", + "I'm going to use 0 instead of that illegal character code.") +end + -- \ucs: 単なる identity 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 + if type(i)~='number' then error_invalid_charcode(i); i=0 end tex.write(i) end -- \kuten: 面区点 （それぞれで16進2桁を使用）=> Unicode 符号位置 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 + if type(i)~='number' then error_invalid_charcode(i); i=0 end if (i%256==0)or(i%256>94) then - tex.write('0') + tex.write '0' else tex.write(tostring(jisx0208.table_jisx0208_uptex[math.floor(i/256)*94+(i%256)-94] or 0)) end @@ -62,11 +58,8 @@ end -- \euc: EUC-JP による符号位置 => Unicode 符号位置 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 + if type(i)~='number' then + error_invalid_charcode(i); i=0 elseif i>=0x10000 or i<0xa0a0 then i=0 end @@ -75,22 +68,14 @@ end -- \jis: ISO-2022-JP による符号位置 => Unicode 符号位置 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 + if type(i)~='number' then error_invalid_charcode(i); i=0 end from_kuten(i-0x2020) end -- \sjis: Shift_JIS による符号位置 => Unicode 符号位置 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 + error_invalid_charcode(i); tex.write '0'; return end local c2 = math.floor(i/256) local c1 = i%256 @@ -102,20 +87,19 @@ local function from_sjis(i) { [false]=15 } } if c2 >= 0x81 then if c2 >= 0xF0 then -- this if block won't be true - if (c2 <= 0xF3 or (c2 == 0xF4 and c1 < 0x9F)) then - c2 = 0x100 + shift_jisx0213_s1a3_table[c2 - 0xF0 + 1][(0x9E < c1)]; - else -- 78<=k<=94 - c2 = c2 * 2 - 413 + 0x100; if 0x9E < c1 then c2=c2+1 end - end + if (c2 <= 0xF3 or (c2 == 0xF4 and c1 < 0x9F)) then + c2 = 0x100 + shift_jisx0213_s1a3_table[c2 - 0xF0 + 1][(0x9E < c1)]; + else -- 78<=k<=94 + c2 = c2 * 2 - 413 + 0x100; if 0x9E < c1 then c2=c2+1 end + end else - if c2<=0x9f then i=0x101 else i=0x181 end - c2 = c2 + c2 - i; if 0x9E < c1 then c2=c2+1 end + if c2<=0x9f then i=0x101 else i=0x181 end + c2 = c2 + c2 - i; if 0x9E < c1 then c2=c2+1 end end if c1 < 0x9F then - if c1>0x7f then i=0x40 else i=0x3f end - c1 = c1 - i + if c1>0x7f then i=0x40 else i=0x3f end; c1 = c1 - i else - c1 = c1 - 0x9e + c1 = c1 - 0x9e end from_kuten(c2*256+c1) end @@ -124,9 +108,9 @@ 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.') + '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) @@ -134,11 +118,8 @@ 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, + 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 |