lltjfont.sty: fix definition of \font{series,shape}force

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

diff --git a/src/ltj-inputbuf.lua b/src/ltj-inputbuf.lua
index d039f7d..9c1f4e1 100644 (file)
--- a/src/ltj-inputbuf.lua
+++ b/src/ltj-inputbuf.lua
@@ -1,14 +1,14 @@
 --
--- luatexja/ltj-inputbuf.lua
+-- 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 utflen = utf.len
+local utfbyte = utf.byte
+local utfchar = utf.char
 local node_new = node.new
 local node_free = node.free
 local id_glyph = node.id('glyph')
@@ -19,7 +19,7 @@ local ltjc_is_japanese_char_curlist = ltjc.is_japanese_char_curlist
 --- Instead of "%", we use U+FFFFF for suppressing spaces.
 --DEBUG require"socket"
 local time_line = 0
-local start_time_measure, stop_time_measure 
+local start_time_measure, stop_time_measure
    = ltjb.start_time_measure, ltjb.stop_time_measure
 local function add_comment(buffer)
    start_time_measure('inputbuf')
@@ -33,7 +33,7 @@ local function add_comment(buffer)
       if c>=0x80 then
         local ct = getcatcode(c)
         local te = tex.endlinechar
-        local ctl = (te ~= -1) and (getcatcode(te)==5) and (getcatcode(getcount('ltjlineendcomment')==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 \ltjlineendcomment (new comment char) is 14 (comment)?
         if ((ct==11) or (ct==12)) and ctl then