11573668360

Committed 29 Oct 2024 12:17PM UTC coverage: 58.059% (-9.6%) from 67.697%

Build # 11573668360

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #2139 from Omikhleia/fix-math-tex-limits

TeX-math limits and other commands behaving as big ops

Run Details

6 of 11 new or added lines in 1 file covered. (54.55%)

1797 existing lines in 50 files now uncovered.

10360 of 17844 relevant lines covered (58.06%)

3713.48 hits per line

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

90.0

/types/length.lua

--- SILE length type.
-- Lengths are composed of 3 `measurement`s: a length, a stretch, and a shrink. Each part internally is just
-- a measurement, but combined describe a flexible length that is allowed to grow up to the amount defined by stretch or
-- compress up to the amount defined by shrink.
-- @types length

local function _error_if_not_number (a)
   if type(a) ~= "number" then
      SU.error("We tried to do impossible arithmetic on a " .. SU.type(a) .. ". (That's a bug)", true)
   end
end

--- @type length
local length = pl.class()
length.type = "length"

length.length = nil
length.stretch = nil
length.shrink = nil

--- Constructor.
-- @tparam measurement spec A measurement or value that can be cast to a measurement.
-- @tparam[opt=0] measurement stretch A measurement describing how much the length is allowed to grow.
-- @tparam[opt=0] measurement shrink A measurement describing how much the length is allowed to grow.
-- @treturn length
-- @usage
-- SILE.types.length("6em", "4pt", "2pt")
-- SILE.types.length("6em plus 4pt minus 2pt")
-- SILE.types.length(30, 4, 2)
function length:_init (spec, stretch, shrink)
   if stretch or shrink then
      self.length = SILE.types.measurement(spec or 0)
      self.stretch = SILE.types.measurement(stretch or 0)
      self.shrink = SILE.types.measurement(shrink or 0)
   elseif type(spec) == "number" then
      self.length = SILE.types.measurement(spec)
   elseif SU.type(spec) == "measurement" then
      self.length = spec
   elseif SU.type(spec) == "glue" then
      self.length = SILE.types.measurement(spec.width.length or 0)
      self.stretch = SILE.types.measurement(spec.width.stretch or 0)
      self.shrink = SILE.types.measurement(spec.width.shrink or 0)
   elseif type(spec) == "table" then
      self.length = SILE.types.measurement(spec.length or 0)
      self.stretch = SILE.types.measurement(spec.stretch or 0)
      self.shrink = SILE.types.measurement(spec.shrink or 0)
   elseif type(spec) == "string" then
      local amount = tonumber(spec)
      if type(amount) == "number" then
         self:_init(amount)
      else
         local parsed = SILE.parserBits.length:match(spec)
         if not parsed then
            SU.error("Could not parse length '" .. spec .. "'")
         end
         self:_init(parsed)
      end
   end
   if not self.length then
      self.length = SILE.types.measurement()
   end
   if not self.stretch then
      self.stretch = SILE.types.measurement()
   end
   if not self.shrink then
      self.shrink = SILE.types.measurement()
   end
end

function length:absolute ()
   return SILE.types.length(self.length:tonumber(), self.stretch:tonumber(), self.shrink:tonumber())
end

function length:negate ()
   return self:__unm()
end

function length:tostring ()
   return self:__tostring()
end

function length:tonumber ()
   return self.length:tonumber()
end

function length:__tostring ()
   local str = tostring(self.length)
   if self.stretch.amount ~= 0 then
      str = str .. " plus " .. tostring(self.stretch)
   end
   if self.shrink.amount ~= 0 then
      str = str .. " minus " .. tostring(self.shrink)
   end
   return str
end

function length:__add (other)
   if type(self) == "number" then
      self, other = other, self
   end
   other = SU.cast("length", other)
   return SILE.types.length(self.length + other.length, self.stretch + other.stretch, self.shrink + other.shrink)
end

-- See usage comments on SILE.types.measurement:___add()
function length:___add (other)
   if SU.type(other) ~= "length" then
      self.length:___add(other)
   else
      self.length:___add(other.length)
      self.stretch:___add(other.stretch)
      self.shrink:___add(other.shrink)
   end
   return nil
end

function length:__sub (other)
   local result = SILE.types.length(self)
   other = SU.cast("length", other)
   result.length = result.length - other.length
   result.stretch = result.stretch - other.stretch
   result.shrink = result.shrink - other.shrink
   return result
end

-- See usage comments on SILE.types.measurement:___add()
function length:___sub (other)
   self.length:___sub(other.length)
   self.stretch:___sub(other.stretch)
   self.shrink:___sub(other.shrink)
   return nil
end

function length:__mul (other)
   if type(self) == "number" then
      self, other = other, self
   end
   _error_if_not_number(other)
   local result = SILE.types.length(self)
   result.length = result.length * other
   result.stretch = result.stretch * other
   result.shrink = result.shrink * other
   return result
end

function length:__div (other)
   local result = SILE.types.length(self)
   _error_if_not_number(other)
   result.length = result.length / other
   result.stretch = result.stretch / other
   result.shrink = result.shrink / other
   return result
end

function length:__unm ()
   local result = SILE.types.length(self)
   result.length = result.length:__unm()
   return result
end

function length:__lt (other)
   local a = SU.cast("number", self)
   local b = SU.cast("number", other)
   return a - b < 0
end

function length:__le (other)
   local a = SU.cast("number", self)
   local b = SU.cast("number", other)
   return a - b <= 0
end

function length:__eq (other)
   local a = SU.cast("length", self)
   local b = SU.cast("length", other)
   return a.length == b.length and a.stretch == b.stretch and a.shrink == b.shrink
end

return length

1	--- SILE length type.
2	-- Lengths are composed of 3 `measurement`s: a length, a stretch, and a shrink. Each part internally is just
3	-- a measurement, but combined describe a flexible length that is allowed to grow up to the amount defined by stretch or
4	-- compress up to the amount defined by shrink.
5	-- @types length
6
7	local function _error_if_not_number (a)
8	if type(a) ~= "number" then	432✔
9	SU.error("We tried to do impossible arithmetic on a " .. SU.type(a) .. ". (That's a bug)", true)	×
10	end
11	end
12
13	--- @type length
14	local length = pl.class()	40✔
15	length.type = "length"	40✔
16
17	length.length = nil	40✔
18	length.stretch = nil	40✔
19	length.shrink = nil	40✔
20
21	--- Constructor.
22	-- @tparam measurement spec A measurement or value that can be cast to a measurement.
23	-- @tparam[opt=0] measurement stretch A measurement describing how much the length is allowed to grow.
24	-- @tparam[opt=0] measurement shrink A measurement describing how much the length is allowed to grow.
25	-- @treturn length
26	-- @usage
27	-- SILE.types.length("6em", "4pt", "2pt")
28	-- SILE.types.length("6em plus 4pt minus 2pt")
29	-- SILE.types.length(30, 4, 2)
30	function length:_init (spec, stretch, shrink)	40✔
31	if stretch or shrink then	51,390✔
32	self.length = SILE.types.measurement(spec or 0)	20,028✔
33	self.stretch = SILE.types.measurement(stretch or 0)	20,028✔
34	self.shrink = SILE.types.measurement(shrink or 0)	20,028✔
35	elseif type(spec) == "number" then	41,376✔
36	self.length = SILE.types.measurement(spec)	30,032✔
37	elseif SU.type(spec) == "measurement" then	52,720✔
38	self.length = spec	719✔
39	elseif SU.type(spec) == "glue" then	51,282✔
UNCOV 40	self.length = SILE.types.measurement(spec.width.length or 0)	×
UNCOV 41	self.stretch = SILE.types.measurement(spec.width.stretch or 0)	×
UNCOV 42	self.shrink = SILE.types.measurement(spec.width.shrink or 0)	×
43	elseif type(spec) == "table" then	25,641✔
44	self.length = SILE.types.measurement(spec.length or 0)	16,432✔
45	self.stretch = SILE.types.measurement(spec.stretch or 0)	16,432✔
46	self.shrink = SILE.types.measurement(spec.shrink or 0)	16,432✔
47	elseif type(spec) == "string" then	17,425✔
48	local amount = tonumber(spec)	538✔
49	if type(amount) == "number" then	538✔
50	self:_init(amount)	6✔
51	else
52	local parsed = SILE.parserBits.length:match(spec)	535✔
53	if not parsed then	535✔
54	SU.error("Could not parse length '" .. spec .. "'")	×
55	end
56	self:_init(parsed)	535✔
57	end
58	end
59	if not self.length then	51,390✔
60	self.length = SILE.types.measurement()	33,774✔
61	end
62	if not self.stretch then	51,390✔
63	self.stretch = SILE.types.measurement()	65,244✔
64	end
65	if not self.shrink then	51,390✔
66	self.shrink = SILE.types.measurement()	65,244✔
67	end
68	end
69
70	function length:absolute ()	40✔
71	return SILE.types.length(self.length:tonumber(), self.stretch:tonumber(), self.shrink:tonumber())	19,752✔
72	end
73
74	function length:negate ()	40✔
75	return self:__unm()	×
76	end
77
78	function length:tostring ()	40✔
79	return self:__tostring()	×
80	end
81
82	function length:tonumber ()	40✔
83	return self.length:tonumber()	35,679✔
84	end
85
86	function length:__tostring ()	40✔
87	local str = tostring(self.length)	2✔
88	if self.stretch.amount ~= 0 then	2✔
89	str = str .. " plus " .. tostring(self.stretch)	2✔
90	end
91	if self.shrink.amount ~= 0 then	2✔
92	str = str .. " minus " .. tostring(self.shrink)	×
93	end
94	return str	2✔
95	end
96
97	function length:__add (other)	40✔
98	if type(self) == "number" then	4,147✔
99	self, other = other, self	1,794✔
100	end
101	other = SU.cast("length", other)	8,294✔
102	return SILE.types.length(self.length + other.length, self.stretch + other.stretch, self.shrink + other.shrink)	16,588✔
103	end
104
105	-- See usage comments on SILE.types.measurement:___add()
106	function length:___add (other)	40✔
107	if SU.type(other) ~= "length" then	31,434✔
108	self.length:___add(other)	1,596✔
109	else
110	self.length:___add(other.length)	14,919✔
111	self.stretch:___add(other.stretch)	14,919✔
112	self.shrink:___add(other.shrink)	14,919✔
113	end
114	return nil	15,717✔
115	end
116
117	function length:__sub (other)	40✔
118	local result = SILE.types.length(self)	4,661✔
119	other = SU.cast("length", other)	9,322✔
120	result.length = result.length - other.length	9,322✔
121	result.stretch = result.stretch - other.stretch	9,322✔
122	result.shrink = result.shrink - other.shrink	9,322✔
123	return result	4,661✔
124	end
125
126	-- See usage comments on SILE.types.measurement:___add()
127	function length:___sub (other)	40✔
128	self.length:___sub(other.length)	933✔
129	self.stretch:___sub(other.stretch)	933✔
130	self.shrink:___sub(other.shrink)	933✔
131	return nil	933✔
132	end
133
134	function length:__mul (other)	40✔
135	if type(self) == "number" then	429✔
136	self, other = other, self	6✔
137	end
138	_error_if_not_number(other)	429✔
139	local result = SILE.types.length(self)	429✔
140	result.length = result.length * other	858✔
141	result.stretch = result.stretch * other	858✔
142	result.shrink = result.shrink * other	858✔
143	return result	429✔
144	end
145
146	function length:__div (other)	40✔
147	local result = SILE.types.length(self)	3✔
148	_error_if_not_number(other)	3✔
149	result.length = result.length / other	6✔
150	result.stretch = result.stretch / other	6✔
151	result.shrink = result.shrink / other	6✔
152	return result	3✔
153	end
154
155	function length:__unm ()	40✔
156	local result = SILE.types.length(self)	22✔
157	result.length = result.length:__unm()	44✔
158	return result	22✔
159	end
160
161	function length:__lt (other)	40✔
162	local a = SU.cast("number", self)	10,719✔
163	local b = SU.cast("number", other)	10,719✔
164	return a - b < 0	10,719✔
165	end
166
167	function length:__le (other)	40✔
168	local a = SU.cast("number", self)	3✔
169	local b = SU.cast("number", other)	3✔
170	return a - b <= 0	3✔
171	end
172
173	function length:__eq (other)	40✔
UNCOV 174	local a = SU.cast("length", self)	×
UNCOV 175	local b = SU.cast("length", other)	×
UNCOV 176	return a.length == b.length and a.stretch == b.stretch and a.shrink == b.shrink	×
177	end
178
179	return length	40✔

sile-typesetter / sile / 11573668360

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