3849002768

Build Type

push

github

Committed by GitHub

Commit Message

Merge f1334c9ed into 13df3c1f5

Run Details

53 of 53 new or added lines in 7 files covered. (100.0%)

11 of 14758 relevant lines covered (0.07%)

0.0 hits per line

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

0.0

/core/frameparser.lua

local lpeg = require("lpeg")
local cassowary = require("cassowary")

local P, C, V = lpeg.P, lpeg.C, lpeg.V

local function resolveMeasurement (str)
  return SILE.measurement(str):tonumber()
end

local functionOfFrame = function (dim, id)
  if not SILE.frames[id] then
    -- TODO: Fix this race condition properly!
    SILE.newFrame({ id = id })
  end
  return SILE.frames[id].variables[dim]
end

local number = SILE.parserBits.number
local identifier = SILE.parserBits.identifier
local measurement = SILE.parserBits.measurement / resolveMeasurement
local ws = SILE.parserBits.ws
local dims = P"top" + P"left" + P"bottom" + P"right" + P"width" + P"height"
local relation = C(dims) * ws * P"(" * ws * C(identifier) * ws * P")" / functionOfFrame

local primary = relation + measurement + number

-- For unit testing
SILE._frameParserBits = {
  measurement = measurement,
  relation = relation,
}

return P{
  "additive",
  additive = V"plus" + V"minus" + V"multiplicative",
  multiplicative = V"times" + V"divide" + V"primary",
  primary = (ws * primary * ws) + V"braced",
  plus = ws * V"multiplicative" * ws * P"+" * ws * V"additive" * ws / cassowary.plus,
  minus = ws * V"multiplicative" * ws * P"-" * ws * V"additive" * ws / cassowary.minus,
  times = ws * V"primary" * ws * P"*" * ws * V"multiplicative" * ws / cassowary.times,
  divide = ws * V"primary" * ws * P"/" * ws * V"multiplicative" * ws / cassowary.divide,
  braced = ws * P"(" * ws * V"additive" * ws * P")" * ws
}

1	local lpeg = require("lpeg")	×
2	local cassowary = require("cassowary")	×
3
4	local P, C, V = lpeg.P, lpeg.C, lpeg.V	×
5
6	local function resolveMeasurement (str)
7	return SILE.measurement(str):tonumber()	×
8	end
9
10	local functionOfFrame = function (dim, id)
11	if not SILE.frames[id] then	×
12	-- TODO: Fix this race condition properly!
13	SILE.newFrame({ id = id })	×
14	end
15	return SILE.frames[id].variables[dim]	×
16	end
17
18	local number = SILE.parserBits.number	×
19	local identifier = SILE.parserBits.identifier	×
20	local measurement = SILE.parserBits.measurement / resolveMeasurement	×
21	local ws = SILE.parserBits.ws	×
22	local dims = P"top" + P"left" + P"bottom" + P"right" + P"width" + P"height"	×
23	local relation = C(dims) * ws * P"(" * ws * C(identifier) * ws * P")" / functionOfFrame	×
24
25	local primary = relation + measurement + number	×
26
27	-- For unit testing
28	SILE._frameParserBits = {	×
29	measurement = measurement,
30	relation = relation,
31	}
32
33	return P{	×
34	"additive",
35	additive = V"plus" + V"minus" + V"multiplicative",
36	multiplicative = V"times" + V"divide" + V"primary",
37	primary = (ws * primary * ws) + V"braced",
38	plus = ws * V"multiplicative" * ws * P"+" * ws * V"additive" * ws / cassowary.plus,
39	minus = ws * V"multiplicative" * ws * P"-" * ws * V"additive" * ws / cassowary.minus,
40	times = ws * V"primary" * ws * P"" ws * V"multiplicative" * ws / cassowary.times,
41	divide = ws * V"primary" * ws * P"/" * ws * V"multiplicative" * ws / cassowary.divide,
42	braced = ws * P"(" * ws * V"additive" * ws * P")" * ws	×
43	}

sile-typesetter / sile / 3849002768

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