Skip to content

Commit d2fb48a

Browse files
committed
fix(cli): Correctly pass through font manager preference from Rust CLI
Previously only working properly from the Lua CLI.
1 parent c219499 commit d2fb48a

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

core/cli.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ cli.parseArguments = function ()
9090
table.insert(SILE.input.evaluateAfters, statement)
9191
end
9292
if opts.fontmanager then
93-
SILE.forceFontManager = opts.fontmanager
93+
SILE.input.fontmanager = opts.fontmanager
9494
end
9595
if opts.makedeps then
9696
SILE.makeDeps = require("core.makedeps")

core/fontmanager.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ end)
66

77
fontManager.face = function (self, ...)
88
local manager
9-
if SILE.forceFontManager then
10-
manager = self[SILE.forceFontManager]
9+
if SILE.input.fontmanager then
10+
manager = self[SILE.input.fontmanager]
1111
else
1212
manager = self.macfonts and self.macfonts or self.fontconfig
1313
end

spec/opentype_spec.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SILE = require("core.sile")
22
SILE.input.backend = "debug"
3-
SILE.forceFontManager = "fontconfig"
3+
SILE.input.fontmanager = "fontconfig"
44
SILE.init()
55

66
-- These tests depend on loading specific fonts from our test fixtures. Running

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ pub fn run(
136136
sile_input.set("backend", backend)?;
137137
}
138138
if let Some(fontmanager) = fontmanager {
139-
sile.set("fontmanager", fontmanager)?;
139+
sile_input.set("fontmanager", fontmanager)?;
140140
}
141141
if let Some(class) = class {
142142
sile_input.set("class", class)?;

0 commit comments

Comments
 (0)