summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/luaotfload-configuration.lua4
-rw-r--r--src/luaotfload-database.lua8
-rw-r--r--src/luaotfload-loaders.lua1
3 files changed, 6 insertions, 7 deletions
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua
index 701f7b2..8faf3d1 100644
--- a/src/luaotfload-configuration.lua
+++ b/src/luaotfload-configuration.lua
@@ -89,7 +89,7 @@ local config_paths = {
}
local valid_formats = tabletohash {
- "otf", "ttc", "ttf", "dfont", "afm", --"pfb", "pfa",
+ "otf", "ttc", "ttf", "afm", --"pfb", "pfa",
}
local feature_presets = {
@@ -188,7 +188,7 @@ local permissible_color_callbacks = {
local default_config = {
db = {
- formats = "otf,ttf,ttc,dfont",
+ formats = "otf,ttf,ttc",
scan_local = false,
skip_read = false,
strip = true,
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 6fe01ba..135ab0e 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -207,8 +207,7 @@ local make_luanames = function (path)
end
local format_precedence = {
- "otf", "ttc", "ttf",
- "dfont", "afm",
+ "otf", "ttc", "ttf", "afm",
--- "pfb", "pfa",
}
@@ -336,7 +335,7 @@ This is a sketch of the luaotfload db:
}
and metadata = {
created : string // creation time
- formats : string list; // { "otf", "ttf", "ttc", "dfont" }
+ formats : string list; // { "otf", "ttf", "ttc" }
local : bool; (* set if local fonts were added to the db *)
modified : string // modification time
statistics : TODO; // created when built with "--stats"
@@ -360,7 +359,7 @@ This is a sketch of the luaotfload db:
conflicts : { barename : int; basename : int }; // filename conflict with font at index; happens with subfonts
familyname : string; // sanitized name of the font family the font belongs to, usually from the names table
fontname : string; // sanitized name of the font
- format : string; // "otf" | "ttf" | "dfont" | "afm"
+ format : string; // "otf" | "ttf" | "afm"
fullname : string; // sanitized full name of the font including style modifiers
fullpath : string; // path to font in filesystem
index : int; // index in the mappings table
@@ -1619,7 +1618,6 @@ ot_fullinfo = function (filename,
end
local loaders = {
- dfont = ot_fullinfo,
otf = ot_fullinfo,
ttc = ot_fullinfo,
ttf = ot_fullinfo,
diff --git a/src/luaotfload-loaders.lua b/src/luaotfload-loaders.lua
index d3828aa..f0c1913 100644
--- a/src/luaotfload-loaders.lua
+++ b/src/luaotfload-loaders.lua
@@ -83,6 +83,7 @@ local install_formats = function ()
and aux ("pfa", unsupported_reader "pfa")
and aux ("pfb", unsupported_reader "pfb")
and aux ("ofm", readers.tfm)
+ and aux ("dfont", unsupported_reader "dfont")
end
--[[doc--