Merge pull request #280 from phi-gamma/master

refactor main a bit further; fix  #278

1 files changed, 5 insertions, 229 deletions

diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua
index 5ac1421..b633ed7 100644
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@ -65,16 +65,8 @@ luaotfload.module = {
 --doc]]--
 
 local luatexbase       = luatexbase
-
 local require          = require
-local setmetatable     = setmetatable
-local type, next       = type, next
-local stringlower      = string.lower
-local stringformat     = string.format
-
-local kpsefind_file    = kpse.find_file
-local lfsisfile        = lfs.isfile
-
+local type             = type
 local add_to_callback  = luatexbase.add_to_callback
 local create_callback  = luatexbase.create_callback
 local reset_callback   = luatexbase.reset_callback
@@ -177,228 +169,12 @@ load_luaotfload_module "loaders"         --- Type1 font wrappers
 load_luaotfload_module "database"        --- Font management.
 load_luaotfload_module "colors"          --- Per-font colors.
 
-if not config.actions.reconfigure () then
-    logreport ("log", 0, "load", "Post-configuration hooks failed.")
-end
-
---[[doc--
-
-    Relying on the \verb|name:| resolver for everything has been the
-    source of permanent trouble with the database.
-    With the introduction of the new syntax parser we now have enough
-    granularity to distinguish between the \XETEX emulation layer and
-    the genuine \verb|name:| and \verb|file:| lookups of \LUATEX-Fonts.
-    Another benefit is that we can now easily plug in or replace new
-    lookup behaviors if necessary.
-    The name resolver remains untouched, but it calls
-    \luafunction{fonts.names.resolve()} internally anyways (see
-    \fileent{luaotfload-database.lua}).
-
---doc]]--
-
-local filesuffix          = file.suffix
-local fileremovesuffix    = file.removesuffix
-local request_resolvers   = fonts.definers.resolvers
-local formats             = fonts.formats
-local names               = fonts.names
-formats.ofm               = "type1"
-
-fonts.encodings.known     = fonts.encodings.known or { }
-
---[[doc--
+luaotfload.resolvers = load_luaotfload_module "resolvers" --- Font lookup
 
-    \identifier{luaotfload} promises easy access to system fonts.
-    Without additional precautions, this cannot be achieved by
-    \identifier{kpathsea} alone, because it searches only the
-    \fileent{texmf} directories by default.
-    Although it is possible for \identifier{kpathsea} to include extra
-    paths by adding them to the \verb|OSFONTDIR| environment variable,
-    this is still short of the goal »\emphasis{it just works!}«.
-    When building the font database \identifier{luaotfload} scans
-    system font directories anyways, so we already have all the
-    information for looking sytem fonts.
-    With the release version 2.2 the file names are indexed in the
-    database as well and we are ready to resolve \verb|file:| lookups
-    this way.
-    Thus we no longer need to call the \identifier{kpathsea} library in
-    most cases when looking up font files, only when generating the
-    database, and when verifying the existence of a file in the
-    \fileent{texmf} tree.
-
---doc]]--
-
-local resolve_file        = names.font_file_lookup
-
-local file_resolver = function (specification)
-    local name    = resolve_file (specification.name)
-    local suffix  = filesuffix(name)
-    if formats[suffix] then
-        specification.forced      = stringlower (suffix)
-        specification.forcedname  = file.removesuffix(name)
-    else
-        specification.name = name
-    end
-end
-
-request_resolvers.file = file_resolver
-
---[[doc--
-
-    We classify as \verb|anon:| those requests that have neither a
-    prefix nor brackets. According to Khaled\footnote{%
-        \url{https://github.com/phi-gamma/luaotfload/issues/4#issuecomment-17090553}.
-    }
-    they are the \XETEX equivalent of a \verb|name:| request, so we
-    will be treating them as such.
-
---doc]]--
-
---request_resolvers.anon = request_resolvers.name
-
---[[doc--
-
-    There is one drawback, though.
-    This syntax is also used for requesting fonts in \identifier{Type1}
-    (\abbrev{tfm}, \abbrev{ofm}) format.
-    These are essentially \verb|file:| lookups and must be caught
-    before the \verb|name:| resolver kicks in, lest they cause the
-    database to update.
-    Even if we were to require the \verb|file:| prefix for all
-    \identifier{Type1} requests, tests have shown that certain fonts
-    still include further fonts (e.~g. \fileent{omlgcb.ofm} will ask
-    for \fileent{omsecob.tfm}) \emphasis{using the old syntax}.
-    For this reason, we introduce an extra check with an early return.
-
---doc]]--
-
-local type1_formats = { "tfm", "ofm", "TFM", "OFM", }
-
-request_resolvers.anon = function (specification)
-    local name = specification.name
-    for i=1, #type1_formats do
-        local format = type1_formats[i]
-        local suffix = filesuffix (name)
-        if resolvers.findfile(name, format) then
-            local usename = suffix == format and file.removesuffix (name) or name
-            specification.forcedname = file.addsuffix (usename, format)
-            specification.forced     = format
-            return
-        end
-    end
-    --- under some weird circumstances absolute paths get
-    --- passed to the definer; we have to catch them
-    --- before the name: resolver misinterprets them.
-    name = specification.specification
-    local exists, _ = lfsisfile(name)
-    if exists then --- garbage; we do this because we are nice,
-                   --- not because it is correct
-        logreport ("log", 1, "load", "file %q exists", name)
-        logreport ("log", 1, "load",
-                   "... overriding borked anon: lookup with path: lookup")
-        specification.name = name
-        request_resolvers.path(specification)
-        return
-    end
-    request_resolvers.name(specification)
-end
+luaotfload.resolvers.install ()
 
---[[doc--
-
-    Prior to version 2.2, \identifier{luaotfload} did not distinguish
-    \verb|file:| and \verb|path:| lookups, causing complications with
-    the resolver.
-    Now we test if the requested name is an absolute path in the file
-    system, otherwise we fall back to the \verb|file:| lookup.
-
---doc]]--
-
-request_resolvers.path = function (specification)
-    local name       = specification.name
-    local exists, _  = lfsisfile(name)
-    if not exists then -- resort to file: lookup
-        logreport ("log", 0, "load",
-                   "path lookup of %q unsuccessful, falling back to file:",
-                   name)
-        file_resolver (specification)
-    else
-        local suffix = filesuffix (name)
-        if formats[suffix] then
-            specification.forced      = stringlower (suffix)
-            specification.name        = file.removesuffix(name)
-            specification.forcedname  = name
-        else
-            specification.name = name
-        end
-    end
-end
-
---[[doc--
-
-    {\bfseries EXPERIMENTAL}:
-    \identifier{kpse}-only resolver, for those who can do without
-    system fonts.
-
---doc]]--
-
-request_resolvers.kpse = function (specification)
-    local name       = specification.name
-    local suffix     = filesuffix(name)
-    if suffix and formats[suffix] then
-        name = file.removesuffix(name)
-        if resolvers.findfile(name, suffix) then
-            specification.forced       = stringlower (suffix)
-            specification.forcedname   = name
-            return
-        end
-    end
-    for t, format in next, formats do --- brute force
-        if kpse.find_file (name, format) then
-            specification.forced = t
-            specification.name   = name
-            return
-        end
-    end
-end
-
---[[doc--
-
-    The \verb|name:| resolver.
-
---doc]]--
-
---- fonts.names.resolvers.name -- Customized version of the
---- generic name resolver.
-
-request_resolvers.name = function (specification)
-    local resolver = names.resolve_cached
-    if config.luaotfload.run.resolver == "normal" then
-        resolver = names.resolve_name
-    end
-    local resolved, subfont = resolver (specification)
-    if resolved then
-        logreport ("log", 0, "load", "Lookup/name: %q -> \"%s%s\"",
-                   specification.name,
-                   resolved,
-                   subfont and stringformat ("(%d)", subfont) or "")
-        specification.resolved   = resolved
-        specification.sub        = subfont
-        specification.forced     = stringlower (filesuffix (resolved) or "")
-        specification.forcedname = resolved
-        specification.name       = fileremovesuffix (resolved)
-    else
-        file_resolver (specification)
-    end
-end
-
---[[doc--
-
-    Also {\bfseries EXPERIMENTAL}: custom file resolvers via callback.
-
---doc]]--
-create_callback("luaotfload.resolve_font", "simple", dummy_function)
-
-request_resolvers.my = function (specification)
-    call_callback("luaotfload.resolve_font", specification)
+if not config.actions.reconfigure () then
+    logreport ("log", 0, "load", "Post-configuration hooks failed.")
 end
 
 --[[doc--