Skip to content

Commit

Permalink
fix breakage of uniquifying code due to use of fntdir and try to make…
Browse files Browse the repository at this point in the history
… uniquify do something more reasonable in non-standalone mode anyway
  • Loading branch information
Clea F. Rees committed Nov 8, 2024
1 parent cb3cb9d commit a5c96ab
Showing 1 changed file with 30 additions and 17 deletions.
47 changes: 30 additions & 17 deletions fontinst.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- $Id: fontinst.lua 10585 2024-11-08 03:31:12Z cfrees $
-- $Id: fontinst.lua 10586 2024-11-08 06:06:22Z cfrees $
-- Build configuration for electrumadf
-- l3build.pdf listing 1 tudalen 9
--[[
Expand Down Expand Up @@ -255,29 +255,42 @@ function uniquify (tag)
local pkgbase = pkgbase or ""
if standalone then
dir = keepdir
if pkgbase == "" then
print("pkgbase unspecified. Trying to guess ... ")
if ctanpkg ~= module and module ~= "" and module ~= nil then
print("Guessing " .. module)
pkgbase = module
else
pkgbase = string.gsub(ctanpkg, "adf$", "")
if pkgbase ~= "" then
print("Guessing " .. pkgbase)
end
end
end
else
dir = fntdir
if pkgbase == "" then
local pkglist = filelist(dir,"*.sty")
if #pkglist ~= 0 then
pkgbase = pkglist[1]
end
if pkgbase == "" then
print("pkgbase unspecified. Trying to guess ... ")
if ctanpkg ~= module and module ~= "" and module ~= nil then
print("Guessing " .. module)
pkgbase = module
else
pkgbase = string.gsub(ctanpkg, "adf$", "")
if pkgbase ~= "" then
print("Guessing " .. pkgbase)
end
end
end
if pkgbase == "" then
local pkglist = filelist(dir,"*.sty")
if #pkglist ~= 0 then
pkglist = filelist(unpackdir,"*.sty")
end
if #pkglist ~= 0 then
pkgbase = string.gsub(pkglist[1], "%.sty", "")
print("Guessing " .. pkgbase)
end
end
if pkgbase == "" then
pkgbase = "NotAMatchAtAll"
gwall("Guessing pkgbase ","",1)
end
local encs = encs or filelist(dir,"*.enc")
local maps = maps or filelist(dir,"*.map")
print("Uniquifying encodings ... ")
for _,i in ipairs(encs) do print(" " .. i) end
print("\nUniquifying maps ... ")
for _,i in ipairs(maps) do print(" " .. i) end
print(" ...\n")
if #encs == 0 then
return 0
else
Expand Down

0 comments on commit a5c96ab

Please sign in to comment.