diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-29 15:02:52 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-29 15:02:52 +0200 |
| commit | 71f44e48c73c13d23431274f5886f9480a60fc24 (patch) | |
| tree | 8939726a4ab60d86c2461f74827940e8fb0e3e27 /fontdbutil.lua | |
| parent | 9c16f2f73eed3946020b0197d9fe97034c4f9f24 (diff) | |
| parent | e79f34d859d48be485589f19fc6905afa5872a53 (diff) | |
| download | luaotfload-71f44e48c73c13d23431274f5886f9480a60fc24.tar.gz | |
merge newsyntax branch into master
Diffstat (limited to 'fontdbutil.lua')
| -rwxr-xr-x | fontdbutil.lua | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fontdbutil.lua b/fontdbutil.lua index 1aa99d0..470d282 100755 --- a/fontdbutil.lua +++ b/fontdbutil.lua @@ -28,7 +28,7 @@ string.quoted = string.quoted or function (str) return string.format("%q",str) end -dofile(loader_path) +require(loader_path) --[[doc-- Depending on how the script is called we change its behavior. @@ -276,14 +276,20 @@ actions.query = function (job) optsize = 0, } - local foundname, _whatever, success = + local foundname, subfont, success = fonts.names.resolve(nil, nil, tmpspec) if success then logs.names_report(false, 1, "resolve", "Font “%s” found!", query) - logs.names_report(false, 1, - "resolve", "Resolved file name “%s”", foundname) + if subfont then + logs.names_report(false, 1, "resolve", + "Resolved file name “%s”, subfont nr. “%s”", + foundname, subfont) + else + logs.names_report(false, 1, + "resolve", "Resolved file name “%s”", foundname) + end if job.show_info then show_font_info(foundname) end |