Skip to content

Commit

Permalink
Merge pull request #1888 from sile-typesetter/quieter
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque authored Oct 11, 2023
2 parents 5cb1d05 + ff18bbc commit 7fd281b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
9 changes: 3 additions & 6 deletions core/sile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,7 @@ function SILE.processFile (filename, format, options)
if SILE.masterDir and SILE.masterDir:len() >= 1 then
_G.extendSilePath(SILE.masterDir)
end
filename = SILE.resolveFile(filename)
if not filename then
SU.error("Could not find file")
end
filename = SILE.resolveFile(filename) or SU.error("Could not find file")
local mode = lfs.attributes(filename).mode
if mode ~= "file" and mode ~= "named pipe" then
SU.error(filename.." isn't a file or named pipe, it's a ".. mode .."!")
Expand Down Expand Up @@ -393,8 +390,8 @@ function SILE.resolveFile (filename, pathprefix)
local resolved, err = package.searchpath(filename, path, "/")
if resolved then
if SILE.makeDeps then SILE.makeDeps:add(resolved) end
else
SU.warn(("Unable to find file '%s': %s"):format(filename, err))
elseif SU.debugging("paths") then
SU.debug("paths", ("Unable to find file '%s': %s"):format(filename, err))
end
return resolved
end
Expand Down
8 changes: 4 additions & 4 deletions packages/bibtex/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ end)
---@diagnostic enable: undefined-global, unused-local, lowercase-global

local parseBibtex = function (fn)
fn = SILE.resolveFile(fn)
local fh,e = io.open(fn)
if e then SU.error("Error reading bibliography file "..e) end
fn = SILE.resolveFile(fn) or SU.error("Unable to resolve Bibtex file "..fn)
local fh, e = io.open(fn)
if e then SU.error("Error reading bibliography file: "..e) end
local doc = fh:read("*all")
local t = epnf.parsestring(bibtexparser, doc)
if not(t) or not(t[1]) or t.id ~= "document" then
if not t or not t[1] or t.id ~= "document" then
SU.error("Error parsing bibtex")
end
local entries = {}
Expand Down

0 comments on commit 7fd281b

Please sign in to comment.