summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-01-02 21:16:37 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2014-01-02 21:16:37 +0100
commitcd9eb96cbb2fe57061aa7efdec3e4bc1513aa04e (patch)
tree6ed7a4510fce9b754ba14445619a5c232b4e7b18
parentb86cc36d326998dfb0d8bf1e062cfbf53a0c2b3a (diff)
downloadluaotfload-cd9eb96cbb2fe57061aa7efdec3e4bc1513aa04e.tar.gz
[tool] destroy --alias option and legacy mkluatexfontdb emulation
-rwxr-xr-xluaotfload-tool.lua43
1 files changed, 5 insertions, 38 deletions
diff --git a/luaotfload-tool.lua b/luaotfload-tool.lua
index 9c3569a..894cf63 100755
--- a/luaotfload-tool.lua
+++ b/luaotfload-tool.lua
@@ -127,12 +127,7 @@ do -- we don’t have file.basename and the likes yet, so inline parser ftw
local extension = dot * (1 - slash - dot)^1
local p_basename = path^-1 * C(thename) * extension^-1 * P(-1)
- local self = lpegmatch(p_basename, stringlower(arg[0]))
- if self == "luaotfload-tool" then
- luaotfloadconfig.self = "luaotfload-tool"
- else
- luaotfloadconfig.self = "mkluatexfontdb"
- end
+ luaotfloadconfig.self = "luaotfload-tool"
end
config.lualibs = config.lualibs or { }
@@ -211,9 +206,6 @@ This tool is part of the luaotfload package. Valid options are:
"environment", "index", "permissions", or
"repository"
- --alias=<name> force behavior of "luaotfload-tool" or legacy
- "mkluatexfontdb"
-
-------------------------------------------------------------------------------
DATABASE
@@ -258,26 +250,9 @@ The font cache will be written to
]],
mkluatexfontdb = [[
-
-Usage: %s [OPTION]...
-
-Rebuild or update the Luaotfload font names database.
-
-Valid options:
- -f --force force re-indexing all fonts
- -q --quiet don't output anything
- -v --verbose=LEVEL be more verbose (print the searched directories)
- -vv print the loaded fonts
- -vvv print all steps of directory searching
- -V --version print version and exit
- -h --help print this message
- --alias=<name> force behavior of "luaotfload-tool" or legacy
- "mkluatexfontdb"
-
-The font database will be saved to
- %s
- %s
-
+FATAL ERROR
+As of Luaotfload v2.5, legacy behavior is not supported anymore. Please
+update your scripts and/or habits! Kthxbye.
]],
short = [[
Usage: luaotfload-tool [--help] [--version] [--verbose=<lvl>]
@@ -1099,7 +1074,6 @@ local process_cmdline = function ( ) -- unit -> jobspec
}
local long_options = {
- alias = 1,
cache = 1,
["no-compress"] = "c",
diagnose = 1,
@@ -1186,8 +1160,6 @@ local process_cmdline = function ( ) -- unit -> jobspec
elseif v == "I" then
result.show_info = true
result.full_info = true
- elseif v == "alias" then
- luaotfloadconfig.self = optarg[n]
elseif v == "l" then
action_pending["flush"] = true
elseif v == "list" then
@@ -1233,12 +1205,7 @@ local process_cmdline = function ( ) -- unit -> jobspec
end
end
- if luaotfloadconfig.self == "mkluatexfontdb" then --- TODO drop legacy ballast after 2.4
- result.help_version = "mkluatexfontdb"
- action_pending["generate"] = true
- result.log_level = math.max(1, result.log_level)
- logs.set_logout("stdout", finalizers)
- elseif nopts == 0 then
+ if nopts == 0 then
action_pending["help"] = true
result.help_version = "short"
end