summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-13 23:22:17 +0000
committerKarl Berry <karl@freefriends.org>2012-07-13 23:22:17 +0000
commit0b6eaa10b2f47abfb80d42492678e4d55c8b68ab (patch)
tree1b0ec704475b30933b8da1480cc2f394843e1603 /Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
parent989b3bffd78808e0b1f6c950c57ab99b94c02f81 (diff)
luatexja (23jun12)
git-svn-id: svn://tug.org/texlive/trunk@27037 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua17
1 files changed, 10 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
index 512e4d12162..6032b5067bf 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
@@ -14,22 +14,25 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange
local node_new = node.new
local id_glyph = node.id('glyph')
+local getcatcode = tex.getcatcode
--- 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 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
- local ctc = tex.getcatcode(0xFFFFF) -- new comment character
- if ((ct==11) or (ct==12)) and (ctl==5) and (ctc==14) then
- local p = node_new(id_glyph)
+ 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