6713098919

Committed 31 Oct 2023 10:21PM UTC coverage: 52.831% (-21.8%) from 74.636%

Build # 6713098919

Build Type

push

github

Committed by

web-flow

Commit Message

Merge d0a2a1ee9 into b185d4972

Run Details

45 of 45 new or added lines in 3 files covered. (100.0%)

8173 of 15470 relevant lines covered (52.83%)

6562.28 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

84.35

/languages/unicode.lua

local icu = require("justenoughicu")

local chardata = require("char-def")

SILE.nodeMakers.base = pl.class({

    _init = function (self, options)
      self.contents = {}
      self.options = options
      self.token = ""
      self.lastnode = false
      self.lasttype = false
    end,

    makeToken = function (self)
      if #self.contents > 0 then
        coroutine.yield(SILE.shaper:formNnode(self.contents, self.token, self.options))
        SU.debug("tokenizer", "Token:", self.token)
        self.contents = {}
        self.token = ""
        self.lastnode = "nnode"
      end
    end,

    addToken = function (self, char, item)
      self.token = self.token .. char
      table.insert(self.contents, item)
    end,

    makeGlue = function (self, item)
      if SILE.settings:get("typesetter.obeyspaces") or self.lastnode ~= "glue" then
        SU.debug("tokenizer", "Space node")
        coroutine.yield(SILE.shaper:makeSpaceNode(self.options, item))
      end
      self.lastnode = "glue"
      self.lasttype = "sp"
    end,

    makePenalty = function (self, p)
      if self.lastnode ~= "penalty" and self.lastnode ~= "glue" then
        coroutine.yield( SILE.nodefactory.penalty({ penalty = p or 0 }) )
      end
      self.lastnode = "penalty"
    end,

    iterator = function (_, _)
      SU.error("Abstract function nodemaker:iterator called", true)
    end,

    charData = function (_, char)
      local cp = SU.codepoint(char)
      if not chardata[cp] then return {} end
      return chardata[cp]
    end,

    isPunctuation = function (self, char)
      return self.isPunctuationType[self:charData(char).category]
    end,

    isSpace = function (self, char)
      return self.isSpaceType[self:charData(char).linebreak]
    end,

    isBreaking = function (self, char)
      return self.isBreakingType[self:charData(char).linebreak]
    end,
    isQuote = function (self, char)
      return self.isQuoteType[self:charData(char).linebreak]
    end

  })

SILE.nodeMakers.unicode = pl.class(SILE.nodeMakers.base)

SILE.nodeMakers.unicode.isWordType = { cm = true }
SILE.nodeMakers.unicode.isSpaceType = { sp = true }
SILE.nodeMakers.unicode.isBreakingType = { ba = true, zw = true }
SILE.nodeMakers.unicode.isPunctuationType = { po = true }
SILE.nodeMakers.unicode.isQuoteType = {} -- quote linebreak category is ambiguous depending on the language

function SILE.nodeMakers.unicode:dealWith (item)
  local char = item.text
  local cp = SU.codepoint(char)
  local thistype = chardata[cp] and chardata[cp].linebreak
  if self:isSpace(item.text) then
    self:makeToken()
    self:makeGlue(item)
  elseif self:isBreaking(item.text) then
    self:addToken(char, item)
    self:makeToken()
    self:makePenalty(0)
  elseif self:isQuote(item.text) then
    self:addToken(char, item)
    self:makeToken()
  elseif self.lasttype and (thistype and thistype ~= self.lasttype and not self.isWordType[thistype]) then
    self:addToken(char, item)
  else
    self:letterspace()
    self:addToken(char, item)
  end
  self.lasttype = thistype
end

function SILE.nodeMakers.unicode:handleInitialGlue (items)
  local i = 1
  while i <= #items do
    local item = items[i]
    if self:isSpace(item.text) then self:makeGlue(item) else break end
    i = i + 1
  end
  return i, items
end

function SILE.nodeMakers.unicode:letterspace ()
  if not SILE.settings:get("document.letterspaceglue") then return end
  if self.token then self:makeToken() end
  if self.lastnode and self.lastnode ~= "glue" then
    local w = SILE.settings:get("document.letterspaceglue").width
    SU.debug("tokenizer", "Letter space glue:", w)
    coroutine.yield(SILE.nodefactory.kern({ width = w }))
    self.lastnode = "glue"
    self.lasttype = "sp"
  end
end

function SILE.nodeMakers.unicode.isICUBreakHere (_, chunks, item)
  return chunks[1] and (item.index >= chunks[1].index)
end

function SILE.nodeMakers.unicode:handleICUBreak (chunks, item)
  -- The ICU library has told us there is a breakpoint at
  -- this index. We need to...
  local bp = chunks[1]
  -- ... remove this breakpoint (and any out of order ones)
  -- from the ICU breakpoints array so that chunks[1] is
  -- the next index point for comparison against the string...
  while chunks[1] and item.index >= chunks[1].index do
    table.remove(chunks, 1)
  end
  -- ...decide which kind of breakpoint we have here and
  -- handle it appropriately.
  if bp.type == "word" then
    self:handleWordBreak(item)
  elseif bp.type == "line" then
    self:handleLineBreak(item, bp.subtype)
  end
  return chunks
end

function SILE.nodeMakers.unicode:handleWordBreak (item)
  self:makeToken()
  if self:isSpace(item.text) then
    -- Spacing word break
    self:makeGlue(item)
  else -- a word break which isn't a space
    self:addToken(item.text, item)
  end
end

function SILE.nodeMakers.unicode:handleLineBreak (item, subtype)
  -- Because we are in charge of paragraphing, we
  -- will override space-type line breaks, and treat
  -- them just as ordinary word spaces.
  if self:isSpace(item.text) then
    self:handleWordBreak(item)
    return
  end
  -- But explicit line breaks we will turn into
  -- soft and hard breaks.
  self:makeToken()
  self:makePenalty(subtype == "soft" and 0 or -1000)
  local char = item.text
  self:addToken(char, item)
  local cp = SU.codepoint(char)
  self.lasttype = chardata[cp] and chardata[cp].linebreak
end

function SILE.nodeMakers.unicode:iterator (items)
  local fulltext = ""
  for i = 1, #items do
    fulltext = fulltext .. items[i].text
  end
  local chunks = { icu.breakpoints(fulltext, self.options.language) }
  table.remove(chunks, 1)
  return coroutine.wrap(function ()
    local i
    i, self.items = self:handleInitialGlue(items)
    for j = i, #items do
      self.i = j
      self.item = self.items[self.i]
      if self:isICUBreakHere(chunks, self.item) then
        chunks = self:handleICUBreak(chunks, self.item)
      else
        self:dealWith(self.item)
      end
    end
    self:makeToken()
  end)
end

1	local icu = require("justenoughicu")	13✔
2
3	local chardata = require("char-def")	13✔
4
5	SILE.nodeMakers.base = pl.class({	26✔
6
7	_init = function (self, options)
8	self.contents = {}	40✔
9	self.options = options	40✔
10	self.token = ""	40✔
11	self.lastnode = false	40✔
12	self.lasttype = false	40✔
13	end,
14
15	makeToken = function (self)
16	if #self.contents > 0 then	520✔
17	coroutine.yield(SILE.shaper:formNnode(self.contents, self.token, self.options))	584✔
18	SU.debug("tokenizer", "Token:", self.token)	292✔
19	self.contents = {}	292✔
20	self.token = ""	292✔
21	self.lastnode = "nnode"	292✔
22	end
23	end,
24
25	addToken = function (self, char, item)
26	self.token = self.token .. char	1,259✔
27	table.insert(self.contents, item)	1,259✔
28	end,
29
30	makeGlue = function (self, item)
31	if SILE.settings:get("typesetter.obeyspaces") or self.lastnode ~= "glue" then	464✔
32	SU.debug("tokenizer", "Space node")	228✔
33	coroutine.yield(SILE.shaper:makeSpaceNode(self.options, item))	456✔
34	end
35	self.lastnode = "glue"	232✔
36	self.lasttype = "sp"	232✔
37	end,
38
39	makePenalty = function (self, p)
40	if self.lastnode ~= "penalty" and self.lastnode ~= "glue" then	209✔
41	coroutine.yield( SILE.nodefactory.penalty({ penalty = p or 0 }) )	8✔
42	end
43	self.lastnode = "penalty"	209✔
44	end,
45
46	iterator = function (_, _)
47	SU.error("Abstract function nodemaker:iterator called", true)	×
48	end,
49
50	charData = function (_, char)
51	local cp = SU.codepoint(char)	3,524✔
52	if not chardata[cp] then return {} end	3,524✔
53	return chardata[cp]	3,524✔
54	end,
55
56	isPunctuation = function (self, char)
57	return self.isPunctuationType[self:charData(char).category]	×
58	end,
59
60	isSpace = function (self, char)
61	return self.isSpaceType[self:charData(char).linebreak]	3,048✔
62	end,
63
64	isBreaking = function (self, char)
65	return self.isBreakingType[self:charData(char).linebreak]	2,000✔
66	end,
67	isQuote = function (self, char)
68	return self.isQuoteType[self:charData(char).linebreak]	2,000✔
69	end
70
71	})	13✔
72
73	SILE.nodeMakers.unicode = pl.class(SILE.nodeMakers.base)	26✔
74
75	SILE.nodeMakers.unicode.isWordType = { cm = true }	13✔
76	SILE.nodeMakers.unicode.isSpaceType = { sp = true }	13✔
77	SILE.nodeMakers.unicode.isBreakingType = { ba = true, zw = true }	13✔
78	SILE.nodeMakers.unicode.isPunctuationType = { po = true }	13✔
79	SILE.nodeMakers.unicode.isQuoteType = {} -- quote linebreak category is ambiguous depending on the language	13✔
80
81	function SILE.nodeMakers.unicode:dealWith (item)	26✔
82	local char = item.text	1,000✔
83	local cp = SU.codepoint(char)	1,000✔
84	local thistype = chardata[cp] and chardata[cp].linebreak	1,000✔
85	if self:isSpace(item.text) then	2,000✔
86	self:makeToken()	×
87	self:makeGlue(item)	×
88	elseif self:isBreaking(item.text) then	2,000✔
89	self:addToken(char, item)	×
90	self:makeToken()	×
91	self:makePenalty(0)	×
92	elseif self:isQuote(item.text) then	2,000✔
93	self:addToken(char, item)	×
94	self:makeToken()	×
95	elseif self.lasttype and (thistype and thistype ~= self.lasttype and not self.isWordType[thistype]) then	1,000✔
96	self:addToken(char, item)	4✔
97	else
98	self:letterspace()	998✔
99	self:addToken(char, item)	998✔
100	end
101	self.lasttype = thistype	1,000✔
102	end
103
104	function SILE.nodeMakers.unicode:handleInitialGlue (items)	26✔
105	local i = 1	40✔
106	while i <= #items do	51✔
107	local item = items[i]	44✔
108	if self:isSpace(item.text) then self:makeGlue(item) else break end	99✔
109	i = i + 1	11✔
110	end
111	return i, items	40✔
112	end
113
114	function SILE.nodeMakers.unicode:letterspace ()	26✔
115	if not SILE.settings:get("document.letterspaceglue") then return end	1,996✔
116	if self.token then self:makeToken() end	×
117	if self.lastnode and self.lastnode ~= "glue" then	×
118	local w = SILE.settings:get("document.letterspaceglue").width	×
119	SU.debug("tokenizer", "Letter space glue:", w)	×
120	coroutine.yield(SILE.nodefactory.kern({ width = w }))	×
121	self.lastnode = "glue"	×
122	self.lasttype = "sp"	×
123	end
124	end
125
126	function SILE.nodeMakers.unicode.isICUBreakHere (_, chunks, item)	26✔
127	return chunks[1] and (item.index >= chunks[1].index)	1,480✔
128	end
129
130	function SILE.nodeMakers.unicode:handleICUBreak (chunks, item)	26✔
131	-- The ICU library has told us there is a breakpoint at
132	-- this index. We need to...
133	local bp = chunks[1]	480✔
134	-- ... remove this breakpoint (and any out of order ones)
135	-- from the ICU breakpoints array so that chunks[1] is
136	-- the next index point for comparison against the string...
137	while chunks[1] and item.index >= chunks[1].index do	960✔
138	table.remove(chunks, 1)	960✔
139	end
140	-- ...decide which kind of breakpoint we have here and
141	-- handle it appropriately.
142	if bp.type == "word" then	480✔
143	self:handleWordBreak(item)	542✔
144	elseif bp.type == "line" then	209✔
145	self:handleLineBreak(item, bp.subtype)	209✔
146	end
147	return chunks	480✔
148	end
149
150	function SILE.nodeMakers.unicode:handleWordBreak (item)	26✔
151	self:makeToken()	271✔
152	if self:isSpace(item.text) then	542✔
153	-- Spacing word break
154	self:makeGlue(item)	442✔
155	else -- a word break which isn't a space
156	self:addToken(item.text, item)	50✔
157	end
158	end
159
160	function SILE.nodeMakers.unicode:handleLineBreak (item, subtype)	26✔
161	-- Because we are in charge of paragraphing, we
162	-- will override space-type line breaks, and treat
163	-- them just as ordinary word spaces.
164	if self:isSpace(item.text) then	418✔
165	self:handleWordBreak(item)	×
166	return	×
167	end
168	-- But explicit line breaks we will turn into
169	-- soft and hard breaks.
170	self:makeToken()	209✔
171	self:makePenalty(subtype == "soft" and 0 or -1000)	209✔
172	local char = item.text	209✔
173	self:addToken(char, item)	209✔
174	local cp = SU.codepoint(char)	209✔
175	self.lasttype = chardata[cp] and chardata[cp].linebreak	209✔
176	end
177
178	function SILE.nodeMakers.unicode:iterator (items)	26✔
179	local fulltext = ""	40✔
180	for i = 1, #items do	1,531✔
181	fulltext = fulltext .. items[i].text	1,491✔
182	end
183	local chunks = { icu.breakpoints(fulltext, self.options.language) }	40✔
184	table.remove(chunks, 1)	40✔
185	return coroutine.wrap(function ()	40✔
186	local i
187	i, self.items = self:handleInitialGlue(items)	80✔
188	for j = i, #items do	1,520✔
189	self.i = j	1,480✔
190	self.item = self.items[self.i]	1,480✔
191	if self:isICUBreakHere(chunks, self.item) then	2,960✔
192	chunks = self:handleICUBreak(chunks, self.item)	960✔
193	else
194	self:dealWith(self.item)	1,000✔
195	end
196	end
197	self:makeToken()	40✔
198	end)
199	end

sile-typesetter / sile / 6713098919

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous