14284237390

Committed 05 Apr 2025 05:33PM UTC coverage: 63.158% (+31.8%) from 31.375%

Build # 14284237390

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #2248 from alerque/class-warfare

Normalize module layout across all module types

Run Details

257 of 350 new or added lines in 14 files covered. (73.43%)

71 existing lines in 11 files now uncovered.

13670 of 21644 relevant lines covered (63.16%)

3070.68 hits per line

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

87.25

/core/font.lua

--- font
-- @module SILE.font
local icu = require("justenoughicu")

local lastshaper

local bits = require("core.parserbits")
local lpeg = require("lpeg")
local Ct, Cg, P = lpeg.Ct, lpeg.Cg, lpeg.P
local adjust_metric = P("ex-height") + P("cap-height")
-- stylua: ignore start
local adjustment = Ct(Cg(bits.number, "amount")^-1 * bits.ws * Cg(adjust_metric, "unit"))
-- stylua: ignore end

local function measureFontAdjustment (metric)
   if metric == "ex-height" then
      -- Uses the height of lowercase letters.
      -- This is used to normalize lowercase letters across fonts.
      -- The height of the lowercase letter "x" is used as the reference.
      -- Another option would be to use the OS/2 font table sxHeight value when available.
      return SILE.shaper:measureChar("x").height
   end
   if metric == "cap-height" then
      -- Uses the the height of uppercase letters.
      -- This is used to normalize uppercase letters across fonts.
      -- The height of the uppercase letter "H" is used as the reference.
      -- Another option would be to use the OS/2 font table sCapHeight value when available.
      return SILE.shaper:measureChar("H").height
   end
   SU.error("Unknown font adjust metric " .. metric)
end

local function adjustedFontSize (options)
   local adjust = options.adjust
   local parsed = adjustment:match(adjust)
   if not parsed then
      SU.error("Couldn't parse font adjust value " .. adjust)
   end
   -- Shallow copy: we don't want to modify the original AST as content may be reused
   -- in other contexts (e.g. running headers) and may need to adapt to different font sizes.
   local baseOpts = pl.tablex.copy(options)
   baseOpts.adjust = nil -- cancel for target font size calculation
   local currentMeasure = measureFontAdjustment(parsed.unit)
   local ratio = parsed.amount or 1
   local newMeasure
   -- Apply the target font size to measure the new font
   SILE.call("font", baseOpts, function ()
      newMeasure = measureFontAdjustment(parsed.unit)
   end)
   return SILE.settings:get("font.size") * ratio * (currentMeasure / newMeasure)
end

SILE.registerCommand("font", function (options, content)
   if SU.ast.hasContent(content) then
      SILE.settings:pushState()
   end
   if options.adjust then
      if options.size then
         SU.error("Can't specify both 'size' and 'adjust' in a \\font command")
      end
      SILE.settings:set("font.size", adjustedFontSize(options))
   end
   if options.filename then
      SILE.settings:set("font.filename", options.filename)
   end
   if options.family then
      SILE.settings:set("font.family", options.family)
      SILE.settings:set("font.filename", "")
   end
   if options.size then
      local size = SU.cast("measurement", options.size)
      if not size then
         SU.error("Couldn't parse font size " .. options.size)
      end
      SILE.settings:set("font.size", size:absolute())
   end
   if options.weight then
      SILE.settings:set("font.weight", 0 + options.weight)
   end
   if options.style then
      SILE.settings:set("font.style", options.style)
   end
   if options.variant then
      SILE.settings:set("font.variant", options.variant)
   end
   if options.features then
      SILE.settings:set("font.features", options.features)
   end
   if options.variations then
      SILE.settings:set("font.variations", options.variations)
   end
   if options.direction then
      SILE.settings:set("font.direction", options.direction)
   end
   if options.language then
      if options.language ~= "und" and icu and icu.canonicalize_language then
         local newlang = icu.canonicalize_language(options.language)
         -- if newlang ~= options.language then
         -- SU.warn("Language '"..options.language.."' not canonical, '"..newlang.."' will be used instead")
         -- end
         options.language = newlang
      end
      SILE.languageSupport.loadLanguage(options.language)
      SILE.settings:set("document.language", options.language)
   end
   if options.script then
      SILE.settings:set("font.script", options.script)
   elseif SILE.settings:get("document.language") then
      local lang = SILE.languageSupport.languages[SILE.settings:get("document.language")]
      if lang and lang.defaultScript then
         SILE.settings:set("font.script", lang.defaultScript)
      end
   end
   if options.hyphenchar then
      -- must be in the form of, for example, "-" or "U+2010" or "0x2010" (Unicode hex codepoint)
      SILE.settings:set("font.hyphenchar", SU.utf8charfromcodepoint(options.hyphenchar))
   end

   -- We must *actually* load the font here, because by the time we're inside
   -- SILE.shaper.shapeToken, it's too late to respond appropriately to things
   -- that the post-load hook might want to do.
   SILE.font.cache(SILE.font.loadDefaults(options), SILE.shaper.getFace)

   if SU.ast.hasContent(content) then
      SILE.process(content)
      SILE.settings:popState()
      if SILE.shaper._name == "harfbuzzWithColor" and lastshaper then
         SU.debug("color-fonts", "Switching from color fonts shaper back to previous shaper")
         SILE.typesetter:leaveHmode(true)
         lastshaper, SILE.shaper = nil, lastshaper
      end
   end
end, "Set current font family, size, weight, style, variant, script, direction and language", nil, true)

SILE.settings:declare({ parameter = "font.family", type = "string or nil", default = "Gentium Plus" })
SILE.settings:declare({ parameter = "font.size", type = "number or integer", default = 10 })
SILE.settings:declare({ parameter = "font.weight", type = "integer", default = 400 })
SILE.settings:declare({ parameter = "font.variant", type = "string", default = "normal" })
SILE.settings:declare({ parameter = "font.script", type = "string", default = "" })
SILE.settings:declare({ parameter = "font.style", type = "string", default = "" })
SILE.settings:declare({ parameter = "font.direction", type = "string", default = "" })
SILE.settings:declare({ parameter = "font.filename", type = "string or nil", default = "" })
SILE.settings:declare({ parameter = "font.features", type = "string", default = "" })
SILE.settings:declare({ parameter = "font.variations", type = "string", default = "" })
SILE.settings:declare({ parameter = "font.hyphenchar", type = "string", default = "-" })

SILE.fontCache = {}

local _key = function (options)
   return table.concat({
      options.family,
      ("%g"):format(SILE.types.measurement(options.size):tonumber()),
      ("%d"):format(options.weight or 0),
      options.style,
      options.variant,
      options.features,
      options.variations,
      options.direction,
      options.filename,
   }, ";")
end

local font = {

   loadDefaults = function (options)
      if not options.family then
         options.family = SILE.settings:get("font.family")
      end
      if not options.size then
         options.size = SILE.settings:get("font.size")
      end
      if not options.weight then
         options.weight = SILE.settings:get("font.weight")
      end
      if not options.style then
         options.style = SILE.settings:get("font.style")
      end
      if not options.variant then
         options.variant = SILE.settings:get("font.variant")
      end
      if SILE.settings:get("font.filename") ~= "" then
         options.filename = SILE.settings:get("font.filename")
         options.family = ""
      end
      if not options.language then
         options.language = SILE.settings:get("document.language")
      end
      if not options.script then
         options.script = SILE.settings:get("font.script")
      end
      if not options.direction then
         options.direction = SILE.settings:get("font.direction")
         if not options.direction or options.direction == "" then
            options.direction = SILE.typesetter and SILE.typesetter.frame and SILE.typesetter.frame:writingDirection()
               or "LTR"
         end
      end
      if not options.features then
         options.features = SILE.settings:get("font.features")
      end
      if not options.variations then
         options.variations = SILE.settings:get("font.variations")
      end
      if not options.hyphenchar then
         options.hyphenchar = SILE.settings:get("font.hyphenchar")
      end
      return options
   end,

   cache = function (options, callback)
      local key = _key(options)
      if not SILE.fontCache[key] then
         SU.debug("fonts", "Looking for", key)
         local face = callback(options)
         SILE.fontCache[key] = face
      end
      local cached = SILE.fontCache[key]
      SILE.font.postLoadHook(cached)
      return cached
   end,

   finish = function ()
      for key, font in pairs(SILE.fontCache) do
         if font.tempfilename ~= font.filename then
            SU.debug("fonts", "Removing temporary file of", key, ":", font.tempfilename)
            os.remove(font.tempfilename)
         end
      end
   end,

   postLoadHook = function (face)
      local ot = require("core.opentype-parser")
      local font = ot.parseFont(face)
      if font.cpal then
         SILE.require("packages.color-fonts")
         if SILE.shaper._name ~= "harfbuzzWithColor" then
            SU.debug("color-fonts", "Switching to color font Shaper")
            SILE.typesetter:leaveHmode(true)
            lastshaper, SILE.shaper = SILE.shaper, SILE.shapers.harfbuzzWithColor()
         end
      end
   end,

   _key = _key,
}

return font

1	--- font
2	-- @module SILE.font
3	local icu = require("justenoughicu")	306✔
4
5	local lastshaper
6
7	local bits = require("core.parserbits")	306✔
8	local lpeg = require("lpeg")	306✔
9	local Ct, Cg, P = lpeg.Ct, lpeg.Cg, lpeg.P	306✔
10	local adjust_metric = P("ex-height") + P("cap-height")	306✔
11	-- stylua: ignore start
12	local adjustment = Ct(Cg(bits.number, "amount")^-1 * bits.ws * Cg(adjust_metric, "unit"))	306✔
13	-- stylua: ignore end
14
15	local function measureFontAdjustment (metric)
16	if metric == "ex-height" then	8✔
17	-- Uses the height of lowercase letters.
18	-- This is used to normalize lowercase letters across fonts.
19	-- The height of the lowercase letter "x" is used as the reference.
20	-- Another option would be to use the OS/2 font table sxHeight value when available.
21	return SILE.shaper:measureChar("x").height	16✔
22	end
23	if metric == "cap-height" then	×
24	-- Uses the the height of uppercase letters.
25	-- This is used to normalize uppercase letters across fonts.
26	-- The height of the uppercase letter "H" is used as the reference.
27	-- Another option would be to use the OS/2 font table sCapHeight value when available.
28	return SILE.shaper:measureChar("H").height	×
29	end
30	SU.error("Unknown font adjust metric " .. metric)	×
31	end
32
33	local function adjustedFontSize (options)
34	local adjust = options.adjust	4✔
35	local parsed = adjustment:match(adjust)	4✔
36	if not parsed then	4✔
37	SU.error("Couldn't parse font adjust value " .. adjust)	×
38	end
39	-- Shallow copy: we don't want to modify the original AST as content may be reused
40	-- in other contexts (e.g. running headers) and may need to adapt to different font sizes.
41	local baseOpts = pl.tablex.copy(options)	4✔
42	baseOpts.adjust = nil -- cancel for target font size calculation	4✔
43	local currentMeasure = measureFontAdjustment(parsed.unit)	4✔
44	local ratio = parsed.amount or 1	4✔
45	local newMeasure
46	-- Apply the target font size to measure the new font
47	SILE.call("font", baseOpts, function ()	8✔
48	newMeasure = measureFontAdjustment(parsed.unit)	8✔
49	end)
50	return SILE.settings:get("font.size") * ratio * (currentMeasure / newMeasure)	8✔
51	end
52
53	SILE.registerCommand("font", function (options, content)	612✔
54	if SU.ast.hasContent(content) then	1,948✔
55	SILE.settings:pushState()	230✔
56	end
57	if options.adjust then	974✔
58	if options.size then	4✔
59	SU.error("Can't specify both 'size' and 'adjust' in a \\font command")	×
60	end
61	SILE.settings:set("font.size", adjustedFontSize(options))	8✔
62	end
63	if options.filename then	974✔
UNCOV 64	SILE.settings:set("font.filename", options.filename)	×
65	end
66	if options.family then	974✔
67	SILE.settings:set("font.family", options.family)	724✔
68	SILE.settings:set("font.filename", "")	724✔
69	end
70	if options.size then	974✔
71	local size = SU.cast("measurement", options.size)	861✔
72	if not size then	861✔
73	SU.error("Couldn't parse font size " .. options.size)	×
74	end
75	SILE.settings:set("font.size", size:absolute())	1,722✔
76	end
77	if options.weight then	974✔
78	SILE.settings:set("font.weight", 0 + options.weight)	697✔
79	end
80	if options.style then	974✔
81	SILE.settings:set("font.style", options.style)	739✔
82	end
83	if options.variant then	974✔
84	SILE.settings:set("font.variant", options.variant)	671✔
85	end
86	if options.features then	974✔
87	SILE.settings:set("font.features", options.features)	677✔
88	end
89	if options.variations then	974✔
90	SILE.settings:set("font.variations", options.variations)	671✔
91	end
92	if options.direction then	974✔
93	SILE.settings:set("font.direction", options.direction)	673✔
94	end
95	if options.language then	974✔
96	if options.language ~= "und" and icu and icu.canonicalize_language then	689✔
97	local newlang = icu.canonicalize_language(options.language)	689✔
98	-- if newlang ~= options.language then
99	-- SU.warn("Language '"..options.language.."' not canonical, '"..newlang.."' will be used instead")
100	-- end
101	options.language = newlang	689✔
102	end
103	SILE.languageSupport.loadLanguage(options.language)	689✔
104	SILE.settings:set("document.language", options.language)	689✔
105	end
106	if options.script then	974✔
107	SILE.settings:set("font.script", options.script)	1,346✔
108	elseif SILE.settings:get("document.language") then	602✔
109	local lang = SILE.languageSupport.languages[SILE.settings:get("document.language")]	602✔
110	if lang and lang.defaultScript then	301✔
111	SILE.settings:set("font.script", lang.defaultScript)	1✔
112	end
113	end
114	if options.hyphenchar then	974✔
115	-- must be in the form of, for example, "-" or "U+2010" or "0x2010" (Unicode hex codepoint)
116	SILE.settings:set("font.hyphenchar", SU.utf8charfromcodepoint(options.hyphenchar))	1,344✔
117	end
118
119	-- We must actually load the font here, because by the time we're inside
120	-- SILE.shaper.shapeToken, it's too late to respond appropriately to things
121	-- that the post-load hook might want to do.
122	SILE.font.cache(SILE.font.loadDefaults(options), SILE.shaper.getFace)	1,948✔
123
124	if SU.ast.hasContent(content) then	1,948✔
125	SILE.process(content)	230✔
126	SILE.settings:popState()	230✔
127	if SILE.shaper._name == "harfbuzzWithColor" and lastshaper then	230✔
UNCOV 128	SU.debug("color-fonts", "Switching from color fonts shaper back to previous shaper")	×
UNCOV 129	SILE.typesetter:leaveHmode(true)	×
UNCOV 130	lastshaper, SILE.shaper = nil, lastshaper	×
131	end
132	end
133	end, "Set current font family, size, weight, style, variant, script, direction and language", nil, true)	1,280✔
134
135	SILE.settings:declare({ parameter = "font.family", type = "string or nil", default = "Gentium Plus" })	306✔
136	SILE.settings:declare({ parameter = "font.size", type = "number or integer", default = 10 })	306✔
137	SILE.settings:declare({ parameter = "font.weight", type = "integer", default = 400 })	306✔
138	SILE.settings:declare({ parameter = "font.variant", type = "string", default = "normal" })	306✔
139	SILE.settings:declare({ parameter = "font.script", type = "string", default = "" })	306✔
140	SILE.settings:declare({ parameter = "font.style", type = "string", default = "" })	306✔
141	SILE.settings:declare({ parameter = "font.direction", type = "string", default = "" })	306✔
142	SILE.settings:declare({ parameter = "font.filename", type = "string or nil", default = "" })	306✔
143	SILE.settings:declare({ parameter = "font.features", type = "string", default = "" })	306✔
144	SILE.settings:declare({ parameter = "font.variations", type = "string", default = "" })	306✔
145	SILE.settings:declare({ parameter = "font.hyphenchar", type = "string", default = "-" })	306✔
146
147	SILE.fontCache = {}	306✔
148
149	local _key = function (options)
150	return table.concat({	40,038✔
151	options.family,	40,038✔
152	("%g"):format(SILE.types.measurement(options.size):tonumber()),	120,114✔
153	("%d"):format(options.weight or 0),	40,038✔
154	options.style,	40,038✔
155	options.variant,	40,038✔
156	options.features,	40,038✔
157	options.variations,	40,038✔
158	options.direction,	40,038✔
159	options.filename,	40,038✔
160	}, ";")	40,038✔
161	end
162
163	local font = {	306✔
164
165	loadDefaults = function (options)
166	if not options.family then	8,138✔
167	options.family = SILE.settings:get("font.family")	8,978✔
168	end
169	if not options.size then	8,138✔
170	options.size = SILE.settings:get("font.size")	8,704✔
171	end
172	if not options.weight then	8,138✔
173	options.weight = SILE.settings:get("font.weight")	9,342✔
174	end
175	if not options.style then	8,138✔
176	options.style = SILE.settings:get("font.style")	9,258✔
177	end
178	if not options.variant then	8,138✔
179	options.variant = SILE.settings:get("font.variant")	14,934✔
180	end
181	if SILE.settings:get("font.filename") ~= "" then	16,276✔
UNCOV 182	options.filename = SILE.settings:get("font.filename")	×
UNCOV 183	options.family = ""	×
184	end
185	if not options.language then	8,138✔
186	options.language = SILE.settings:get("document.language")	14,588✔
187	end
188	if not options.script then	8,138✔
189	options.script = SILE.settings:get("font.script")	9,390✔
190	end
191	if not options.direction then	8,138✔
192	options.direction = SILE.settings:get("font.direction")	14,930✔
193	if not options.direction or options.direction == "" then	7,465✔
194	options.direction = SILE.typesetter and SILE.typesetter.frame and SILE.typesetter.frame:writingDirection()	7,435✔
195	or "LTR"	7,435✔
196	end
197	end
198	if not options.features then	8,138✔
199	options.features = SILE.settings:get("font.features")	14,922✔
200	end
201	if not options.variations then	8,138✔
202	options.variations = SILE.settings:get("font.variations")	14,934✔
203	end
204	if not options.hyphenchar then	8,138✔
205	options.hyphenchar = SILE.settings:get("font.hyphenchar")	14,932✔
206	end
207	return options	8,138✔
208	end,
209
210	cache = function (options, callback)
211	local key = _key(options)	6,780✔
212	if not SILE.fontCache[key] then	6,780✔
213	SU.debug("fonts", "Looking for", key)	327✔
214	local face = callback(options)	327✔
215	SILE.fontCache[key] = face	327✔
216	end
217	local cached = SILE.fontCache[key]	6,780✔
218	SILE.font.postLoadHook(cached)	6,780✔
219	return cached	6,780✔
220	end,
221
222	finish = function ()
223	for key, font in pairs(SILE.fontCache) do	482✔
224	if font.tempfilename ~= font.filename then	327✔
225	SU.debug("fonts", "Removing temporary file of", key, ":", font.tempfilename)	×
226	os.remove(font.tempfilename)	×
227	end
228	end
229	end,
230
231	postLoadHook = function (face)
232	local ot = require("core.opentype-parser")	6,780✔
233	local font = ot.parseFont(face)	6,780✔
234	if font.cpal then	6,780✔
UNCOV 235	SILE.require("packages.color-fonts")	×
UNCOV 236	if SILE.shaper._name ~= "harfbuzzWithColor" then	×
UNCOV 237	SU.debug("color-fonts", "Switching to color font Shaper")	×
UNCOV 238	SILE.typesetter:leaveHmode(true)	×
UNCOV 239	lastshaper, SILE.shaper = SILE.shaper, SILE.shapers.harfbuzzWithColor()	×
240	end
241	end
242	end,
243
244	_key = _key,	306✔
245	}
246
247	return font	306✔

sile-typesetter / sile / 14284237390

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