X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-inputbuf.lua;h=f97f966039b45ca90cad037765bfae36b2e27801;hb=79acad85e3b942cd4fe555c40886ad295b487fce;hp=4f7c87567559d7ba3b153f568f339b691fa41990;hpb=880636d81e9819b31dec8a5f897bbfaf1732d18b;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-inputbuf.lua b/src/ltj-inputbuf.lua
index 4f7c875..f97f966 100644
--- a/src/ltj-inputbuf.lua
+++ b/src/ltj-inputbuf.lua
@@ -1,39 +1,39 @@
 --
--- luatexja/inputbuf.lua
+-- luatexja/ltj-inputbuf.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.inputbuf',
-  date = '2011/04/01',
-  version = '0.1',
-  description = 'Supressing a space by newline after Japanese characters',
-})
-module('luatexja.inputbuf', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
 
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
 
+local utf = unicode.utf8
 local node_new = node.new
 local id_glyph = node.id('glyph')
+local getcatcode = tex.getcatcode
+local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char
 
 --- the following function is modified from jafontspec.lua (by K. Maeda).
 --- Instead of "%", we use U+FFFFF for suppressing spaces.
-function add_comment(buffer)
+local function add_comment(buffer)
    local i = utf.len(buffer)
-   while (i>0) and (tex.getcatcode(utf.byte(buffer, i))==1 
-		 or tex.getcatcode(utf.byte(buffer, i))==2) do
+   while (i>0) and (getcatcode(utf.byte(buffer, i))==1 
+		 or getcatcode(utf.byte(buffer, i))==2) do
       i=i-1
    end
    if i>0 then
       local c = utf.byte(buffer, i)
-      local ct = tex.getcatcode(c)
-      local ctl = tex.getcatcode(13) -- endline character
-      if ((ct==11) or (ct==12)) and (ctl==5) then
-	 local p =  node_new(id_glyph)
-	 p.char = c
-	 if ltjc.is_ucs_in_japanese_char(p) then
-	    buffer = buffer .. string.char(0xF3,0xBF,0xBF,0xBF) -- U+FFFFF
+      if c>0x80 then
+	 local ct = getcatcode(c)
+	 local te = tex.endlinechar
+	 local ctl = (te ~= -1) and (getcatcode(te)==5) and (getcatcode(0xFFFFF)==14)
+	 -- Is the catcode of endline character is 5 (end-of-line)?
+	 -- Is the catcode of U+FFFFF (new comment char) is 14 (comment)?
+	 if ((ct==11) or (ct==12)) and ctl then
+	    local p = node_new(id_glyph)
+	    p.char = c
+	    if ltjc_is_ucs_in_japanese_char(p) then
+	       buffer = buffer .. string.char(0xF3,0xBF,0xBF,0xBF) -- U+FFFFF
+	    end
+	    node.free(p)
 	 end
-	 node.free(p)
       end
    end
    return buffer