Dnode -> node.direct (WIP)

[luatex-ja/luatexja.git] / src / ltj-inputbuf.lua

diff --git a/src/ltj-inputbuf.lua b/src/ltj-inputbuf.lua
index a5a2001..f8a7b57 100644 (file)
--- a/src/ltj-inputbuf.lua
+++ b/src/ltj-inputbuf.lua
@@ -2,21 +2,27 @@
 -- luatexja/ltj-inputbuf.lua
 --
 
+luatexja.load_module('base');      local ltjb = luatexja.base
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
 
 require("unicode")
 local utflen = unicode.utf8.len
 local utfbyte = unicode.utf8.byte
+local utfchar = unicode.utf8.char
 local node_new = node.new
 local node_free = node.free
 local id_glyph = node.id('glyph')
-local getcatcode = tex.getcatcode
+local getcatcode, getcount = tex.getcatcode, tex.getcount
 local ltjc_is_japanese_char_curlist = ltjc.is_japanese_char_curlist
-local FFFFF = string.char(0xF3,0xBF,0xBF,0xBF)
 
 --- the following function is modified from jafontspec.lua (by K. Maeda).
 --- Instead of "%", we use U+FFFFF for suppressing spaces.
+--DEBUG require"socket"
+local time_line = 0
+local start_time_measure, stop_time_measure
+   = ltjb.start_time_measure, ltjb.stop_time_measure
 local function add_comment(buffer)
+   start_time_measure('inputbuf')
    local i = utflen(buffer)
    while (i>0) and (getcatcode(utfbyte(buffer, i))==1
                 or getcatcode(utfbyte(buffer, i))==2) do
@@ -24,19 +30,20 @@ local function add_comment(buffer)
    end
    if i>0 then
       local c = utfbyte(buffer, i)
-      if c>0x80 then
+      if c>=0x80 then
         local ct = getcatcode(c)
         local te = tex.endlinechar
-        local ctl = (te ~= -1) and (getcatcode(te)==5) and (getcatcode(0xFFFFF)==14)
+        local ctl = (te ~= -1) and (getcatcode(te)==5) and (getcatcode(getcount('ltjlineendcomment'))==14)
         -- Is the catcode of endline character is 5 (end-of-line)?
-        -- Is the catcode of U+FFFFF (new comment char) is 14 (comment)?
+        -- Is the catcode of \ltjlineendcomment (new comment char) is 14 (comment)?
         if ((ct==11) or (ct==12)) and ctl then
            if ltjc_is_japanese_char_curlist(c) then
-              buffer = buffer .. FFFFF -- U+FFFFF
+              buffer = buffer .. utfchar(getcount('ltjlineendcomment'))
            end
         end
       end
    end
+   stop_time_measure('inputbuf')
    return buffer
 end