9481661620

Committed 12 Jun 2024 11:21AM UTC coverage: 70.118% (+0.9%) from 69.177%

Build # 9481661620

Build Type

push

github

Committed by

web-flow

Commit Message

Merge d3461a034 into 8887271be

Run Details

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

20 existing lines in 3 files now uncovered.

12148 of 17325 relevant lines covered (70.12%)

6294.65 hits per line

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

91.72

/languages/unicode.lua

local icu = require("justenoughicu")

local chardata = require("char-def")

SILE.settings:declare({
   parameter = "languages.fixedNbsp",
   type = "boolean",
   default = false,
   help = "Whether to treat U+00A0 (NO-BREAK SPACE) as a fixed-width space",
})

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.types.node.penalty({ penalty = p or 0 }))
      end
      self.lastnode = "penalty"
   end,

   makeNonBreakingSpace = function (self)
      -- Unicode Line Breaking Algorithm (UAX 14) specifies that U+00A0
      -- (NO-BREAK SPACE) is expanded or compressed like a normal space.
      coroutine.yield(SILE.types.node.kern(SILE.shaper:measureSpace(self.options)))
      self.lastnode = "glue"
      self.lasttype = "sp"
   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,

   isActiveNonBreakingSpace = function (self, char)
      return self:isNonBreakingSpace(char) and not SILE.settings:get("languages.fixedNbsp")
   end,

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

   isNonBreakingSpace = function (self, char)
      local c = self:charData(char)
      return c.contextname and c.contextname == "nobreakspace"
   end,

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

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

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

   isWord = function (self, char)
      return self.wordTypes[self:charData(char).linebreak]
   end,
})

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

SILE.nodeMakers.unicode.breakingTypes = { ba = true, zw = true }
SILE.nodeMakers.unicode.puctuationTypes = { po = true }
SILE.nodeMakers.unicode.quoteTypes = {} -- quote linebreak category is ambiguous depending on the language
SILE.nodeMakers.unicode.spaceTypes = { sp = true }
SILE.nodeMakers.unicode.wordTypes = { cm = true }

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:isActiveNonBreakingSpace(item.text) then
      self:makeToken()
      self:makeNonBreakingSpace()
   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:isWord(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.types.node.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)
   elseif self:isActiveNonBreakingSpace(item.text) then
      -- Non-breaking space word break
      self:makeNonBreakingSpace()
   else
      -- a word break which isn't a space
      self:addToken(item.text, item)
   end
end

function SILE.nodeMakers.unicode:_handleWordBreakRepeatHyphen (item)
   -- According to some language rules, when a break occurs at an explicit hyphen,
   -- the hyphen gets repeated at the beginning of the new line
   if item.text == "-" then
      self:addToken(item.text, item)
      self:makeToken()
      if self.lastnode ~= "discretionary" then
         coroutine.yield(SILE.types.node.discretionary({
            postbreak = SILE.shaper:createNnodes("-", self.options),
         }))
         self.lastnode = "discretionary"
      end
   else
      SILE.nodeMakers.unicode.handleWordBreak(self, 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) or self:isActiveNonBreakingSpace(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:_handleLineBreakRepeatHyphen (item, subtype)
   if self.lastnode == "discretionary" then
      -- Initial word boundary after a discretionary:
      -- Bypass it and just deal with the token.
      self:dealWith(item)
   else
      SILE.nodeMakers.unicode.handleLineBreak(self, item, subtype)
   end
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")	174✔
2
3	local chardata = require("char-def")	174✔
4
5	SILE.settings:declare({	174✔
6	parameter = "languages.fixedNbsp",
7	type = "boolean",
8	default = false,
9	help = "Whether to treat U+00A0 (NO-BREAK SPACE) as a fixed-width space",
10	})
11
12	SILE.nodeMakers.base = pl.class({	348✔
13
14	_init = function (self, options)
15	self.contents = {}	6,281✔
16	self.options = options	6,281✔
17	self.token = ""	6,281✔
18	self.lastnode = false	6,281✔
19	self.lasttype = false	6,281✔
20	end,
21
22	makeToken = function (self)
23	if #self.contents > 0 then	14,396✔
24	coroutine.yield(SILE.shaper:formNnode(self.contents, self.token, self.options))	20,892✔
25	SU.debug("tokenizer", "Token:", self.token)	10,446✔
26	self.contents = {}	10,446✔
27	self.token = ""	10,446✔
28	self.lastnode = "nnode"	10,446✔
29	end
30	end,
31
32	addToken = function (self, char, item)
33	self.token = self.token .. char	31,884✔
34	table.insert(self.contents, item)	31,884✔
35	end,
36
37	makeGlue = function (self, item)
38	if SILE.settings:get("typesetter.obeyspaces") or self.lastnode ~= "glue" then	7,786✔
39	SU.debug("tokenizer", "Space node")	3,846✔
40	coroutine.yield(SILE.shaper:makeSpaceNode(self.options, item))	7,692✔
41	end
42	self.lastnode = "glue"	3,893✔
43	self.lasttype = "sp"	3,893✔
44	end,
45
46	makePenalty = function (self, p)
47	if self.lastnode ~= "penalty" and self.lastnode ~= "glue" then	3,690✔
48	coroutine.yield(SILE.types.node.penalty({ penalty = p or 0 }))	106✔
49	end
50	self.lastnode = "penalty"	3,690✔
51	end,
52
53	makeNonBreakingSpace = function (self)
54	-- Unicode Line Breaking Algorithm (UAX 14) specifies that U+00A0
55	-- (NO-BREAK SPACE) is expanded or compressed like a normal space.
56	coroutine.yield(SILE.types.node.kern(SILE.shaper:measureSpace(self.options)))	87✔
57	self.lastnode = "glue"	29✔
58	self.lasttype = "sp"	29✔
59	end,
60
61	iterator = function (_, _)
62	SU.error("Abstract function nodemaker:iterator called", true)	×
63	end,
64
65	charData = function (_, char)
66	local cp = SU.codepoint(char)	129,735✔
67	if not chardata[cp] then	129,735✔
68	return {}	913✔
69	end
70	return chardata[cp]	128,822✔
71	end,
72
73	isActiveNonBreakingSpace = function (self, char)
74	return self:isNonBreakingSpace(char) and not SILE.settings:get("languages.fixedNbsp")	63,813✔
75	end,
76
77	isBreaking = function (self, char)
78	return self.breakingTypes[self:charData(char).linebreak]	55,368✔
79	end,
80
81	isNonBreakingSpace = function (self, char)
82	local c = self:charData(char)	32,041✔
83	return c.contextname and c.contextname == "nobreakspace"	32,041✔
84	end,
85
86	isPunctuation = function (self, char)
87	return self.puctuationTypes[self:charData(char).category]	×
88	end,
89
90	isSpace = function (self, char)
91	return self.spaceTypes[self:charData(char).linebreak]	84,448✔
92	end,
93
94	isQuote = function (self, char)
95	return self.quoteTypes[self:charData(char).linebreak]	55,340✔
96	end,
97
98	isWord = function (self, char)
99	return self.wordTypes[self:charData(char).linebreak]	232✔
100	end,
101	})	174✔
102
103	SILE.nodeMakers.unicode = pl.class(SILE.nodeMakers.base)	348✔
104
105	SILE.nodeMakers.unicode.breakingTypes = { ba = true, zw = true }	174✔
106	SILE.nodeMakers.unicode.puctuationTypes = { po = true }	174✔
107	SILE.nodeMakers.unicode.quoteTypes = {} -- quote linebreak category is ambiguous depending on the language	174✔
108	SILE.nodeMakers.unicode.spaceTypes = { sp = true }	174✔
109	SILE.nodeMakers.unicode.wordTypes = { cm = true }	174✔
110
111	function SILE.nodeMakers.unicode:dealWith (item)	348✔
112	local char = item.text	27,713✔
113	local cp = SU.codepoint(char)	27,713✔
114	local thistype = chardata[cp] and chardata[cp].linebreak	27,713✔
115	if self:isSpace(item.text) then	55,426✔
116	self:makeToken()	29✔
117	self:makeGlue(item)	58✔
118	elseif self:isActiveNonBreakingSpace(item.text) then	55,368✔
119	self:makeToken()	×
120	self:makeNonBreakingSpace()	×
121	elseif self:isBreaking(item.text) then	55,368✔
122	self:addToken(char, item)	14✔
123	self:makeToken()	14✔
124	self:makePenalty(0)	28✔
125	elseif self:isQuote(item.text) then	55,340✔
126	self:addToken(char, item)	×
127	self:makeToken()	×
128	elseif self.lasttype and (thistype and thistype ~= self.lasttype and not self:isWord(thistype)) then	27,786✔
129	self:addToken(char, item)	232✔
130	else
131	self:letterspace()	27,554✔
132	self:addToken(char, item)	27,554✔
133	end
134	self.lasttype = thistype	27,713✔
135	end
136
137	function SILE.nodeMakers.unicode:handleInitialGlue (items)	348✔
138	local i = 1	6,278✔
139	while i <= #items do	6,368✔
140	local item = items[i]	6,346✔
141	if self:isSpace(item.text) then	12,692✔
142	self:makeGlue(item)	180✔
143	else
144	break
145	end
146	i = i + 1	90✔
147	end
148	return i, items	6,278✔
149	end
150
151	function SILE.nodeMakers.unicode:letterspace ()	348✔
152	if not SILE.settings:get("document.letterspaceglue") then	55,108✔
153	return	27,499✔
154	end
155	if self.token then	55✔
156	self:makeToken()	55✔
157	end
158	if self.lastnode and self.lastnode ~= "glue" then	55✔
159	local w = SILE.settings:get("document.letterspaceglue").width	102✔
160	SU.debug("tokenizer", "Letter space glue:", w)	51✔
161	coroutine.yield(SILE.types.node.kern({ width = w }))	102✔
162	self.lastnode = "glue"	51✔
163	self.lasttype = "sp"	51✔
164	end
165	end
166
167	function SILE.nodeMakers.unicode.isICUBreakHere (_, chunks, item)	348✔
168	return chunks[1] and (item.index >= chunks[1].index)	35,716✔
169	end
170
171	function SILE.nodeMakers.unicode:handleICUBreak (chunks, item)	348✔
172	-- The ICU library has told us there is a breakpoint at
173	-- this index. We need to...
174	local bp = chunks[1]	7,995✔
175	-- ... remove this breakpoint (and any out of order ones)
176	-- from the ICU breakpoints array so that chunks[1] is
177	-- the next index point for comparison against the string...
178	while chunks[1] and item.index >= chunks[1].index do	15,990✔
179	table.remove(chunks, 1)	15,990✔
180	end
181	-- ...decide which kind of breakpoint we have here and
182	-- handle it appropriately.
183	if bp.type == "word" then	7,995✔
184	self:handleWordBreak(item)	8,628✔
185	elseif bp.type == "line" then	3,681✔
186	self:handleLineBreak(item, bp.subtype)	3,681✔
187	end
188	return chunks	7,995✔
189	end
190
191	function SILE.nodeMakers.unicode:handleWordBreak (item)	348✔
192	self:makeToken()	4,306✔
193	if self:isSpace(item.text) then	8,612✔
194	-- Spacing word break
195	self:makeGlue(item)	7,548✔
196	elseif self:isActiveNonBreakingSpace(item.text) then	1,064✔
197	-- Non-breaking space word break
198	self:makeNonBreakingSpace()	58✔
199	else
200	-- a word break which isn't a space
201	self:addToken(item.text, item)	503✔
202	end
203	end
204
205	function SILE.nodeMakers.unicode:_handleWordBreakRepeatHyphen (item)	348✔
206	-- According to some language rules, when a break occurs at an explicit hyphen,
207	-- the hyphen gets repeated at the beginning of the new line
208	if item.text == "-" then	4✔
209	self:addToken(item.text, item)	4✔
210	self:makeToken()	4✔
211	if self.lastnode ~= "discretionary" then	4✔
212	coroutine.yield(SILE.types.node.discretionary({	12✔
213	postbreak = SILE.shaper:createNnodes("-", self.options),	8✔
214	}))
215	self.lastnode = "discretionary"	4✔
216	end
217	else
UNCOV 218	SILE.nodeMakers.unicode.handleWordBreak(self, item)	×
219	end
220	end
221
222	function SILE.nodeMakers.unicode:handleLineBreak (item, subtype)	348✔
223	-- Because we are in charge of paragraphing, we
224	-- will override space-type line breaks, and treat
225	-- them just as ordinary word spaces.
226	if self:isSpace(item.text) or self:isActiveNonBreakingSpace(item.text) then	11,028✔
227	self:handleWordBreak(item)	×
228	return	×
229	end
230	-- But explicit line breaks we will turn into
231	-- soft and hard breaks.
232	self:makeToken()	3,676✔
233	self:makePenalty(subtype == "soft" and 0 or -1000)	3,676✔
234	local char = item.text	3,676✔
235	self:addToken(char, item)	3,676✔
236	local cp = SU.codepoint(char)	3,676✔
237	self.lasttype = chardata[cp] and chardata[cp].linebreak	3,676✔
238	end
239
240	function SILE.nodeMakers.unicode:_handleLineBreakRepeatHyphen (item, subtype)	348✔
241	if self.lastnode == "discretionary" then	×
242	-- Initial word boundary after a discretionary:
243	-- Bypass it and just deal with the token.
244	self:dealWith(item)	×
245	else
246	SILE.nodeMakers.unicode.handleLineBreak(self, item, subtype)	×
247	end
248	end
249
250	function SILE.nodeMakers.unicode:iterator (items)	348✔
251	local fulltext = ""	6,278✔
252	for i = 1, #items do	42,084✔
253	fulltext = fulltext .. items[i].text	35,806✔
254	end
255	local chunks = { icu.breakpoints(fulltext, self.options.language) }	6,278✔
256	table.remove(chunks, 1)	6,278✔
257	return coroutine.wrap(function ()	6,278✔
258	local i
259	i, self.items = self:handleInitialGlue(items)	12,556✔
260	for j = i, #items do	41,994✔
261	self.i = j	35,716✔
262	self.item = self.items[self.i]	35,716✔
263	if self:isICUBreakHere(chunks, self.item) then	71,432✔
264	chunks = self:handleICUBreak(chunks, self.item)	15,990✔
265	else
266	self:dealWith(self.item)	27,721✔
267	end
268	end
269	self:makeToken()	6,278✔
270	end)
271	end

sile-typesetter / sile / 9481661620

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