summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2010-03-30 14:59:09 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2010-03-30 14:59:09 +0200
commitb00e00c338955306d524941d680312d99259f9a1 (patch)
treeba7ed523dccc5cc07dd47249cef7881aec29174c
parent33e804f8b3ff14ff7541ec09f49fe5c010a6e5ba (diff)
downloadluaotfload-b00e00c338955306d524941d680312d99259f9a1.tar.gz
Purge removed fonts by default
There is no performance difference, so it doesn't make sense to keep removed fonts in the database.
-rwxr-xr-xmkluatexfontdb.lua11
-rw-r--r--otfl-font-nms.lua16
2 files changed, 7 insertions, 20 deletions
diff --git a/mkluatexfontdb.lua b/mkluatexfontdb.lua
index 3e5b02c..a26b80b 100755
--- a/mkluatexfontdb.lua
+++ b/mkluatexfontdb.lua
@@ -33,7 +33,6 @@ Rebuild the LuaTeX font database.
Valid options:
-d --database-dir=DIRECTORY install the database in the specified directory
-f --force force re-indexing all fonts
- -p --purge purge removed fonts
-q --quiet don't output anything
-v --verbose=LEVEL be more verbose (print the searched directories)
-vv print the loaded fonts
@@ -62,7 +61,6 @@ Here we fill cmdargs with the good values, and then analyze it.
local long_opts = {
['database-dir'] = "d",
force = "f",
- purge = "p",
quiet = "q",
help = "h",
['fc-cache'] = 0 ,
@@ -94,7 +92,6 @@ end
-- a temporary variable, containing the command line option concerning fc-cache
local run_fc_cache = 0
local force_reload = nil
-local purge = nil
local function process_cmdline()
local opts, optind, optarg = alt_getopt.get_ordered_opts (arg, short_opts, long_opts)
@@ -118,8 +115,6 @@ local function process_cmdline()
mkluatexfontdb.directory = optarg [i]
elseif v == "f" then
force_reload = 1
- elseif v == "p" then
- purge = 1
elseif v == "fc-cache" then
run_fc_cache = 1
elseif v == "sys" then
@@ -144,7 +139,7 @@ if not force_reload and file.isreadable(status_file) then
status = dofile(status_file)
end
-local function generate(force, purge)
+local function generate(force)
log("generating font names database.")
local savepath = mkluatexfontdb.directory
if not lfs.isdir(savepath) then
@@ -168,7 +163,7 @@ local function generate(force, purge)
else
fontnames = nil
end
- fontnames, status = names.update(fontnames, status, force, purge)
+ fontnames, status = names.update(fontnames, status, force)
log("%s fonts in %s families in the database",
#fontnames.mappings, #table.keys(fontnames.families))
io.savedata(savepath, table.serialize(fontnames, true))
@@ -176,4 +171,4 @@ local function generate(force, purge)
io.savedata(status_file, table.serialize(status, true))
end
-generate(force_reload, purge)
+generate(force_reload)
diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index e0bc384..130516c 100644
--- a/otfl-font-nms.lua
+++ b/otfl-font-nms.lua
@@ -444,7 +444,7 @@ local function status_init()
}
end
-local function update(fontnames, status, force, purge)
+local function update(fontnames, status, force)
--[[
The main function, scans everything
- fontnames is the final table to return
@@ -464,19 +464,11 @@ local function update(fontnames, status, force, purge)
end
end
end
- local newfontnames = nil
- local newstatus = nil
- if purge then
- newfontnames = fontnames_init()
- newstatus = status_init()
- end
+ local newfontnames = fontnames_init()
+ local newstatus = status_init()
scan_texmf_tree(fontnames, status, newfontnames, newstatus)
scan_os_fonts (fontnames, status, newfontnames, newstatus)
- if purge then
- return newfontnames, newstatus
- else
- return fontnames, status
- end
+ return newfontnames, newstatus
end
names.scan = scan_dir