luaotfload (21apr16)

git-svn-id: svn://tug.org/texlive/trunk@40655 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 309 insertions, 254 deletions

diff --git a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua
index 69b6c976fb1..4b4dc50ecda 100755
--- a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua
+++ b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua
@@ -2,13 +2,13 @@
 -----------------------------------------------------------------------
 --         FILE:  luaotfload-tool.lua
 --  DESCRIPTION:  database functionality
--- REQUIREMENTS:  luaotfload 2.6
+-- REQUIREMENTS:  luaotfload 2.7
 --       AUTHOR:  Khaled Hosny, Élie Roux, Philipp Gesang
 --      LICENSE:  GPL v2.0
 -----------------------------------------------------------------------
 
 luaotfload          = luaotfload or { }
-local version       = "2.6"
+local version       = "2.7"
 luaotfload.version  = version
 luaotfload.self     = "luaotfload-tool"
 
@@ -104,6 +104,7 @@ local iosavedata                = io.savedata
 local lfsisdir                  = lfs.isdir
 local lfsisfile                 = lfs.isfile
 local stringsplit               = string.split
+local tablekeys                 = table.keys
 local tableserialize            = table.serialize
 local tablesortedkeys           = table.sortedkeys
 local tabletohash               = table.tohash
@@ -130,11 +131,38 @@ local backup = {
 
 texio.write, texio.write_nl          = dummy_function, dummy_function
 require "fontloader-basics-gen.lua"
-
 texio.write, texio.write_nl          = backup.write, backup.write_nl
 utilities                            = backup.utilities
 
-fonts = { names = { } } -- for db; normally provided by the fontloaders
+require "fontloader-data-con"
+require "fontloader-font-ini"
+require "fontloader-font-con"
+require "fontloader-fonts-enc"
+require "fontloader-font-cid"
+require "fontloader-font-map"
+require "fontloader-font-tfm"
+require "fontloader-font-afm"
+require "fontloader-font-afk"
+require "fontloader-font-oti"
+require "fontloader-font-otr"
+require "fontloader-font-cff"
+require "fontloader-font-ttf"
+require "fontloader-font-dsp"
+require "fontloader-font-oup"
+require "fontloader-font-otl"
+require "fontloader-font-oto"
+------- "fontloader-font-otj"
+------- "fontloader-font-ota"
+------- "fontloader-font-ots"
+------- "fontloader-font-osd"
+require "fontloader-font-lua"
+require "fontloader-font-def"
+require "fontloader-fonts-ext"
+------- "fontloader-font-gbn"
+
+fonts = fonts or { }
+local fontsnames = fonts.names or { }
+fonts.names      = fontsnames
 
 local require_init = { }
 
@@ -239,8 +267,6 @@ Usage: %s [OPTIONS...]
 
   -i --info                    display basic font metadata
   -I --inspect                 display detailed font metadata
-  -w --warnings                display warnings generated by the
-                               fontloader library
 
   --list=<criterion>           output list of entries by field <criterion>
   --list=<criterion>:<value>   restrict to entries with <criterion>=<value>
@@ -310,14 +336,15 @@ local version_msg = function ( )
     local out   = function (...) texiowrite_nl (stringformat (...)) end
     local uname = os.uname ()
     local meta  = fonts.names.getmetadata ()
+    local info  = status.list ()
     out (about, luaotfload.self)
     out ("%s version: %q", luaotfload.self, version)
     out ("Revision: %q", config.luaotfload.status.notes.revision)
     out ("Lua interpreter: %s; version %q", runtime[1], runtime[2])
-    out ("Luatex SVN revision: %d", status.luatex_svn)
+--[[out ("Luatex SVN revision: %d", info.luatex_svn)]] --> SVN r5624
     out ("Luatex version: %.2f.%d",
-         status.luatex_version / 100,
-         status.luatex_revision)
+         info.luatex_version / 100,
+         info.luatex_revision)
     out ("Platform: type=%s name=%s", os.type, os.name)
 
     local uname_vars = tablesortedkeys (uname)
@@ -363,6 +390,7 @@ local format_counter = function (stack)
 end
 
 local print_heading = function (title, level)
+    if not title then return end
     local structuredata
     if currentdepth == level then -- top is current
         counterstack[#counterstack] = counterstack[#counterstack] + 1
@@ -397,7 +425,7 @@ local baseindent = "    "
 --[[doc--
 
     show_info_items -- Together with show_info_table prints the table returned by
-    fontloader.info(), recursing into nested tables if appropriate (as necessitated
+    readers.getinfo(), recursing into nested tables if appropriate (as necessitated
     by Luatex versions 0.78+ which include the pfminfo table in the result.
 
 --doc]]--
@@ -425,29 +453,6 @@ local show_info_items = function (fontinfo)
     texiowrite_nl ""
 end
 
-local p_eol     = S"\n\r"^1
-local p_space   = S" \t\v"^0
-local p_line    = p_space * C((1 - p_eol)^1)^-1
-local p_lines   = Ct(p_line * (p_eol^1 * p_line^-1)^0)
-
-local show_fontloader_warnings = function (ws)
-    local nws = #ws
-    print_heading(stringformat(
-        [[the fontloader emitted %d warnings]],
-        nws), 2)
-    texiowrite_nl ""
-    for i=1, nws do
-        local w = ws[i]
-        texiowrite_nl (stringformat("%d:", i))
-        local lines = lpegmatch(p_lines, w)
-        for i=1, #lines do
-            local line = lines[i]
-            texiowrite_nl("  · " .. line)
-        end
-        texiowrite_nl ""
-    end
-end
-
 local p_spacechar  = S" \n\r\t\v"
 local p_wordchar   = (1 - p_spacechar)
 local p_whitespace = p_spacechar^1
@@ -457,15 +462,16 @@ local p_words      = Ct(p_word * (p_whitespace * p_word)^0)
 --- string -> int -> string list
 local reflow = function (text, width)
     local words
-    if type(text) == "string" then
+    local t_text = type (text)
+    if t_text == "string" then
         words = lpegmatch(p_words, text)
         if #words < 2 then
             return { text }
         end
-    else
+    elseif t_text == "table" then
         words = text
-        if #words < 2 then
-            return words
+        if #text < 2 then
+            return text
         end
     end
 
@@ -512,42 +518,24 @@ local print_field = function (key, val)
     end
 end
 
-local display_names = function (names)
-    print_heading("Font Metadata", 2)
-    for i=1, #names do
-        local lang, namedata = names[i].lang, names[i].names
-        print_heading(stringformat("Language: %s ", i, lang), 3)
-        texiowrite_nl ""
-        if namedata then
-            for field, value in next, namedata do
-                print_field(field, value)
-            end
-        end
-    end
-end
-
 --- see luafflib.c
 local general_fields = {
     --- second: l -> literal | n -> length | d -> date
     { "fullname",            "l", "font name"           },
     { "version",             "l", "font version"        },
-    { "creationtime",        "d", "creation time"       },
-    { "modificationtime",    "d", "modification time"   },
-    { "subfonts",            "n", "number of subfonts"  },
-    { "glyphcnt",            "l", "number of glyphs"    },
+    { "width",               "l", "width"               },
+    { "averagewidth",        "l", "average width"       },
+    { "panosewidth",         "l", "panose width"        },
     { "weight",              "l", "weight indicator"    },
-    { "design_size",         "l", "design size"         },
-    { "design_range_bottom", "l", "design size min"     },
-    { "design_range_top",    "l", "design size max"     },
-    { "fontstyle_id",        "l", "font style id"       },
-    { "fontstyle_name",      "S", "font style name"     },
-    { "strokewidth",         "l", "stroke width"        },
-    { "units_per_em",        "l", "units per em"        },
-    { "ascent",              "l", "ascender height"     },
-    { "descent",             "l", "descender height"    },
-    { "comments",            "l", "comments"            },
-    { "os2_version",         "l", "os2 version"         },
-    { "sfd_version",         "l", "sfd version"         },
+    { "pfmweight",           "l", "numerical weight"    },
+    { "panoseweight",        "l", "panose weight"       },
+    { "designsize",          "l", "design size"         },
+    { "minsize",             "l", "design size min"     },
+    { "maxsize",             "l", "design size max"     },
+    { "units",               "l", "units per em"        },
+    { "ascender",            "l", "ascender height"     },
+    { "descender",           "l", "descender height"    },
+    { "capheight",           "l", "capital height"      },
 }
 
 local display_general = function (fullinfo)
@@ -607,7 +595,7 @@ local print_features = function (features)
         for script, languages in next, data do
             local field     = stringformat(key_fmt, script).. fieldseparator .. " "
             local wd_field  = #field
-            local lines     = reflow(languages.list, textwidth - wd_field)
+            local lines     = reflow(tablekeys(languages), textwidth - wd_field)
             local indent    = stringrep(" ", wd_field)
             texiowrite_nl(field)
             texiowrite(lines[1])
@@ -620,88 +608,40 @@ local print_features = function (features)
     end
 end
 
-local extract_feature_info = function (set)
-    local collected = { }
-    for i=1, #set do
-        local features = set[i].features
-        if features then
-            for j=1, #features do
-                local feature   = features[j]
-                local scripts   = feature.scripts
-                local tagname   = stringlower(feature.tag)
-                local entry     = collected[tagname] or { }
-
-                for k=1, #scripts do
-                    local script     = scripts[k]
-                    local scriptname = stringlower(script.script)
-                    local c_script   = entry[scriptname] or {
-                                            list = { },
-                                            set  = { },
-                                        }
-                    local list, set  = c_script.list, c_script.set
-
-                    for l=1, #script.langs do
-                        local langname = stringlower(script.langs[l])
-                        if not set[langname] then
-                            list[#list+1] = langname
-                            set[langname] = true
-                        end
-                    end
-                    entry[scriptname] = c_script
-                end
-                collected[tagname]  = entry
-            end
-        end
-    end
-    return collected
+local display_feature_set = function (set)
+    print_features(set)
 end
 
-local display_feature_set = function (set)
-    local collected = extract_feature_info(set)
-    print_features(collected)
+local display_features_type = function (id, feat)
+    if next (feat) then
+        print_heading(id, 3)
+        display_feature_set(feat)
+        return true
+    end
+    return false
 end
 
-local display_features = function (gsub, gpos)
+local display_features = function (features)
     texiowrite_nl ""
+    print_heading("Features", 2)
 
-    if gsub or gpos then
-        print_heading("Features", 2)
-
-        if gsub then
-            print_heading("GSUB Features", 3)
-            display_feature_set(gsub)
-        end
-
-        if gpos then
-            print_heading("GPOS Features", 3)
-            display_feature_set(gpos)
-        end
+    if not display_features_type ("GSUB Features", features.gsub)
+    or not display_features_type ("GPOS Features", features.gpos)
+    then
+        texiowrite_nl("font defines neither gsub nor gpos features")
     end
 end
 
-local show_full_info = function (path, subfont, warnings)
-    local rawinfo, warn = fontloader.open(path, subfont)
-    if warnings then
-        show_fontloader_warnings(warn)
-    end
+local show_full_info = function (path, subfont)
+    local rawinfo, warn = fonts.handlers.otf.readers.loadfont (path, subfont)
     if not rawinfo then
         texiowrite_nl(stringformat([[cannot open font %s]], path))
         return
     end
-    local fontdata = { }
-    local fullinfo = fontloader.to_table(rawinfo)
-    local fields = fontloader.fields(rawinfo)
-    fontloader.close(rawinfo)
-    display_names(fullinfo.names)
-    display_general(fullinfo)
-    display_features(fullinfo.gsub, fullinfo.gpos)
+    display_general(rawinfo.metadata)
+    display_features(rawinfo.resources.features)
 end
 
---- Subfonts returned by fontloader.info() do not correspond
---- to the actual indices required by fontloader.open(), so
---- we try and locate the correct one by matching the request
---- against the full name.
-
 local subfont_by_name
 subfont_by_name = function (lst, askedname, n)
     if not n then
@@ -713,7 +653,7 @@ subfont_by_name = function (lst, askedname, n)
         if fonts.names.sanitize_fontname (font.fullname) == askedname then
             return font
         end
-        return subfont_by_name (lst, askedname, n+1)
+        return subfont_by_name (lst, askedname, n)
     end
     return false
 end
@@ -721,12 +661,12 @@ end
 --[[doc--
 The font info knows two levels of detail:
 
-    a)  basic information returned by fontloader.info(); and
+    a)  basic information returned by readers.getinfo(); and
     b)  detailed information that is a subset of the font table
-        returned by fontloader.open().
+        returned by readers.loadfont().
 --doc]]--
 
-local show_font_info = function (basename, askedname, detail, warnings)
+local show_font_info = function (basename, askedname, detail)
     local filenames = fonts.names.data().files
     local index     = filenames.base[basename]
     local fullname  = filenames.full[index]
@@ -735,7 +675,11 @@ local show_font_info = function (basename, askedname, detail, warnings)
         fullname = resolvers.findfile(basename)
     end
     if fullname then
-        local shortinfo = fontloader.info(fullname)
+        local shortinfo = fonts.handlers.otf.readers.getinfo (fullname, {
+                            subfont        = nil,
+                            platformnames  = true,
+                            rawfamilynames = true,
+                        })
         local nfonts   = #shortinfo
         if nfonts > 0 then -- true type collection
             local subfont
@@ -748,7 +692,7 @@ local show_font_info = function (basename, askedname, detail, warnings)
             if subfont then
                 show_info_items(subfont)
                 if detail == true then
-                    show_full_info(fullname, subfont, warnings)
+                    show_full_info(fullname, subfont)
                 end
             else -- list all subfonts
                 logreport (true, 1, "resolve",
@@ -758,14 +702,14 @@ local show_font_info = function (basename, askedname, detail, warnings)
                                [[Showing info for font no. %d]], n)
                     show_info_items(shortinfo[subfont])
                     if detail == true then
-                        show_full_info(fullname, subfont, warnings)
+                        show_full_info(fullname, subfont)
                     end
                 end
             end
         else
             show_info_items(shortinfo)
             if detail == true then
-                show_full_info(fullname, subfont, warnings)
+                show_full_info(fullname, subfont)
             end
         end
     else
@@ -1240,7 +1184,7 @@ actions.query = function (job)
                        "Resolved file name %q", foundname)
         end
         if job.show_info then
-            show_font_info (foundname, query, job.full_info, job.warnings)
+            show_font_info (foundname, query, job.full_info)
             iowrite "\n"
         end
     else
@@ -1465,7 +1409,6 @@ local process_cmdline = function ( ) -- unit -> jobspec
     local result = { -- jobspec
         force_reload = nil,
         full_info    = false,
-        warnings     = false,
         criterion    = "",
         query        = "",
         log_level    = nil,
@@ -1506,10 +1449,9 @@ local process_cmdline = function ( ) -- unit -> jobspec
         update             = "u",
         verbose            = 1,
         version            = "V",
-        warnings           = "w",
     }
 
-    local short_options = "bcDfFiIlLnpqRSuvVhw"
+    local short_options = "bcDfFiIlLnpqRSuvVh"
 
     local options, _, optarg =
         alt_getopt.get_ordered_opts (arg, short_options, long_options)
@@ -1541,12 +1483,7 @@ local process_cmdline = function ( ) -- unit -> jobspec
             if lvl then
                 lvl = tonumber(lvl)
                 result.log_level = lvl
-                if lvl > 2 then
-                    result.warnings = true
-                end
             end
-        elseif v == "w" then
-            result.warnings = true
         elseif v == "log" then
             local str = optarg[n]
             if str then
diff --git a/Master/texmf-dist/scripts/luaotfload/mkcharacters b/Master/texmf-dist/scripts/luaotfload/mkcharacters
index 59582f211cb..a31c19c035e 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkcharacters
+++ b/Master/texmf-dist/scripts/luaotfload/mkcharacters
@@ -4,16 +4,17 @@
 --        USAGE:  ./mkcharacters.lua 
 --  DESCRIPTION:  import parts of char-def.lua
 -- REQUIREMENTS:  lua, ConTeXt, the lualibs package
---       AUTHOR:  Philipp Gesang (Phg), <phg42.2a@gmail.com>
+--       AUTHOR:  Philipp Gesang (Phg), <phg@phi-gamma.net>
 -----------------------------------------------------------------------
--- we create a stripped-down version of char-def.lua
+-- We create a stripped-down version of char-def.lua, suitable for use
+-- with the generic font loader.
 -----------------------------------------------------------------------
 
 -----------------------------------------------------------------------
 --                              config
 -----------------------------------------------------------------------
-local charfile      = "./build/luaotfload-characters.lua"
-local chardef       = arg[1]
+local mkivpath      = arg[1]
+local charfile      = arg[2] or "./build/luaotfload-characters.lua"
 
 ---  for every code point char-def.lua provides a set of fields. they
 ---  are:
@@ -54,29 +55,36 @@ local import = {
 
 kpse.set_program_name"luatex"
 
-for _, lib in next, { "lualibs-lua.lua",
-                      "lualibs-lpeg.lua",
-                      "lualibs-table.lua", } do
-  local found = assert(kpse.find_file(lib, "lua"),
-                       "Could not locate " .. lib .. ".\n"
-                       .. "Please install the lualibs package.")
-  require(found)
-end
+require "lualibs"
+
+local chardef
+local charini
 
-if not chardef then
-  chardef = kpse.expand_path("~/context/tex/texmf-context/tex/context/base/")
-          .. "/char-def.lua"
+if not mkivpath then
+  mkivpath = assert (kpse.expand_path
+                      "~/context/tex/texmf-context/tex/context/base/mkiv/",
+                     "Failed to locate ConTeXt.")
 end
 
+chardef = mkivpath .. "/char-def.lua"
+charini = mkivpath .. "/char-ini.lua"
+
+--- we could grab the files from contextgarden but as Context is part
+--- of TL it’s not worth bothering
 if not (chardef and lfs.isfile(chardef)) then
-  --- we could grab the file from contextgarden but as Context is part
-  --- of TL it’s not worth bothering 
   chardef = assert(kpse.find_file("char-def.lua", "lua"),
-                   "Could not find ConTeXt.")
+                   "Failed to locate file char-def.lua from ConTeXt.")
+end
+
+if not (charini and lfs.isfile(charini)) then
+  charini = assert(kpse.find_file("char-ini.lua", "lua"),
+                   "Failed to locate file char-ini.lua from ConTeXt.")
 end
 
 io.write(string.format("extracting data from char-def.lua at %s\n",
                        chardef))
+io.write(string.format("loading code from char-ini.lua at %s\n",
+                       charini))
 
 -----------------------------------------------------------------------
 --                           functionality
@@ -127,6 +135,60 @@ local extract_fields = function (data)
   return extract_fields_indeed(data, {}, nil)
 end
 
+--[[ extract_classifiers : from luatex-basics-prepare.tex ]]
+
+local extract_classifiers = function (chardata)
+  dofile (charini)
+  local s_init = 1    local s_rphf =  7
+  local s_medi = 2    local s_half =  8
+  local s_fina = 3    local s_pref =  9
+  local s_isol = 4    local s_blwf = 10
+  local s_mark = 5    local s_pstf = 11
+  local s_rest = 6
+
+  local mappers = {
+    l = s_init,  -- left
+    d = s_medi,  -- double
+    c = s_medi,  -- joiner
+    r = s_fina,  -- right
+    u = s_isol,  -- nonjoiner
+  }
+
+  local first_arabic,  last_arabic  = characters.blockrange("arabic")
+  local first_syriac,  last_syriac  = characters.blockrange("syriac")
+  local first_mandiac, last_mandiac = characters.blockrange("mandiac")
+  local first_nko,     last_nko     = characters.blockrange("nko")
+
+  local classifiers = { }
+
+  for k, c in next, chardata do
+    if k > 0 then
+      local c = chardata[k]
+      if c then
+        local arabic = c.arabic
+        if arabic then
+          classifiers[k] = mappers[arabic]
+          elseif k >= first_arabic  and k <= last_arabic  or k >= first_syriac  and k <= last_syriac  or
+            k >= first_mandiac and k <= last_mandiac or k >= first_nko     and k <= last_nko     then
+            if c.category == "mn" then
+              classifiers[k] = s_mark
+            else
+              classifiers[k] = s_rest
+            end
+          end
+        end
+      end
+    end
+    return classifiers
+  end
+
+local amend_table_fields = function (data, classifiers)
+  --- installed by luatex-basics-prepare.tex
+  data.characters  = { }
+  data.classifiers = classifiers
+  return data
+end
+
 local writedata = function (data)
   local outchan = io.open(charfile, "w")
   if not outchan then
@@ -140,8 +202,10 @@ end
 
 do
   local chardata    = get_characters()
+  local classifiers = extract_classifiers(chardata)
   local stripped    = extract_fields(chardata)
-  local serialized  = table.serialize(stripped, true, {
+  local amended     = amend_table_fields(stripped, classifiers)
+  local serialized  = table.serialize(amended, true, {
     compact   = true,
     noquotes  = true,
     hexify    = true, --- for consistency with char-def
diff --git a/Master/texmf-dist/scripts/luaotfload/mkimport b/Master/texmf-dist/scripts/luaotfload/mkimport
index 08537d7d284..25d75606839 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkimport
+++ b/Master/texmf-dist/scripts/luaotfload/mkimport
@@ -63,7 +63,7 @@ local luatex_fonts_prefix = "luatex"
 local fontloader_subdir   = "src/fontloader"
 
 local origin_paths = {
-  context    = "tex/context/base",
+  context    = { "tex/context/base/mkiv", "tex/context/base", },
   fontloader = "tex/generic/context/luatex",
 }
 
@@ -105,12 +105,22 @@ local loader_target_dir  = "/build/"
 -------------------------------------------------------------------------------
 
 local die = function (...)
-  io.stderr:write "[\x1b[1;30;41mfatal error\x1b[0m]: "
+  io.stderr:write "[\x1b[1;30;41mfatal error\x1b[0m] "
   io.stderr:write (stringformat (...))
   io.stderr:write "\naborting.\n"
   os.exit (1)
 end
 
+local uncertain = 0
+
+local hmm = function (...)
+  uncertain = uncertain + 1
+  --[[ sorta like an error but non-fatal ]]
+  io.stderr:write "[\x1b[1;31merror\x1b[0m] "
+  io.stderr:write (stringformat (...))
+  io.stderr:write "; continuing nontheless.\n"
+end
+
 local emphasis = function (txt)
   return stringformat("\x1b[1m%s\x1b[0m", txt)
 end
@@ -191,18 +201,13 @@ local imports = {
     { name = "basics-gen"        , ours = nil          , kind = kind_essential },
     { name = "basics-nod"        , ours = nil          , kind = kind_merged    },
     { name = "basics"            , ours = nil          , kind = kind_tex       },
-    { name = "fonts-cbk"         , ours = nil          , kind = kind_merged    },
-    { name = "fonts-def"         , ours = nil          , kind = kind_merged    },
     { name = "fonts-demo-vf-1"   , ours = nil          , kind = kind_ignored   },
     { name = "fonts-enc"         , ours = nil          , kind = kind_merged    },
     { name = "fonts-ext"         , ours = nil          , kind = kind_merged    },
-    { name = "fonts-lua"         , ours = nil          , kind = kind_merged    },
     { name = "fonts-merged"      , ours = "reference"  , kind = kind_essential },
-    { name = "fonts-ota"         , ours = nil          , kind = kind_merged    },
     { name = "fonts"             , ours = nil          , kind = kind_merged    },
     { name = "fonts"             , ours = nil          , kind = kind_tex       },
     { name = "fonts-syn"         , ours = nil          , kind = kind_ignored   },
-    { name = "fonts-tfm"         , ours = nil          , kind = kind_merged    },
     { name = "languages"         , ours = nil          , kind = kind_ignored   },
     { name = "languages"         , ours = nil          , kind = kind_tex       },
     { name = "math"              , ours = nil          , kind = kind_ignored   },
@@ -224,18 +229,28 @@ local imports = {
     { name = "data-con"          , ours = "data-con"          , kind = kind_merged    },
     { name = "font-afk"          , ours = "font-afk"          , kind = kind_merged    },
     { name = "font-afm"          , ours = "font-afm"          , kind = kind_merged    },
+    { name = "font-cff"          , ours = "font-cff"          , kind = kind_merged    },
     { name = "font-cid"          , ours = "font-cid"          , kind = kind_merged    },
     { name = "font-con"          , ours = "font-con"          , kind = kind_merged    },
     { name = "font-def"          , ours = "font-def"          , kind = kind_merged    },
+    { name = "font-dsp"          , ours = "font-dsp"          , kind = kind_merged    },
+    { name = "font-gbn"          , ours = "font-gbn"          , kind = kind_merged    },
     { name = "font-ini"          , ours = "font-ini"          , kind = kind_merged    },
-    { name = "font-inj"          , ours = "font-inj"          , kind = kind_merged    },
+    { name = "font-lua"          , ours = "font-lua"          , kind = kind_merged    },
     { name = "font-map"          , ours = "font-map"          , kind = kind_merged    },
-    { name = "font-otb"          , ours = "font-otb"          , kind = kind_merged    },
-    { name = "font-otf"          , ours = "font-otf"          , kind = kind_merged    },
+    { name = "font-osd"          , ours = "font-osd"          , kind = kind_merged    },
+    { name = "font-ota"          , ours = "font-ota"          , kind = kind_merged    },
+    { name = "font-otd"          , ours = "font-otd"          , kind = kind_merged    },
     { name = "font-oti"          , ours = "font-oti"          , kind = kind_merged    },
-    { name = "font-otn"          , ours = "font-otn"          , kind = kind_merged    },
-    { name = "font-otp"          , ours = "font-otp"          , kind = kind_merged    },
+    { name = "font-otj"          , ours = "font-otj"          , kind = kind_merged    },
+    { name = "font-otl"          , ours = "font-otl"          , kind = kind_merged    },
+    { name = "font-oto"          , ours = "font-oto"          , kind = kind_merged    },
+    { name = "font-otr"          , ours = "font-otr"          , kind = kind_merged    },
+    { name = "font-ots"          , ours = "font-ots"          , kind = kind_merged    },
+    { name = "font-oup"          , ours = "font-oup"          , kind = kind_merged    },
     { name = "font-tfm"          , ours = "font-tfm"          , kind = kind_merged    },
+    { name = "font-ttf"          , ours = "font-ttf"          , kind = kind_merged    },
+
     { name = "l-boolean"         , ours = "l-boolean"         , kind = kind_lualibs   },
     { name = "l-file"            , ours = "l-file"            , kind = kind_lualibs   },
     { name = "l-function"        , ours = "l-function"        , kind = kind_lualibs   },
@@ -246,6 +261,7 @@ local imports = {
     { name = "l-string"          , ours = "l-string"          , kind = kind_lualibs   },
     { name = "l-table"           , ours = "l-table"           , kind = kind_lualibs   },
     { name = "util-str"          , ours = "util-str"          , kind = kind_lualibs   },
+    { name = "util-fil"          , ours = "util-fil"          , kind = kind_lualibs   },
   }, --[[ [context] ]]
 } --[[ [imports] ]]
 
@@ -266,33 +282,39 @@ local package = {
 ---   [08] l-boolean.lua
 ---   [09] l-math.lua
 ---   [10] util-str.lua
----   [11] luatex-basics-gen.lua
----   [12] data-con.lua
----   [13] luatex-basics-nod.lua
----   [14] font-ini.lua
----   [15] font-con.lua
----   [16] luatex-fonts-enc.lua
----   [17] font-cid.lua
----   [18] font-map.lua
----   [19] luatex-fonts-syn.lua
----   [20] font-tfm.lua
----   [21] font-afm.lua
----   [22] font-afk.lua
----   [23] luatex-fonts-tfm.lua
----   [24] font-oti.lua
----   [25] font-otf.lua
----   [26] font-otb.lua
----   [27] font-inj.lua
----   [28] luatex-fonts-ota.lua
----   [30] font-otn.lua
----   [30] font-otp.lua
----   [31] luatex-fonts-lua.lua
----   [32] font-def.lua
----   [33] luatex-fonts-def.lua
----   [34] luatex-fonts-ext.lua
----   [35] luatex-fonts-cbk.lua
+---   [11] util-fil.lua
+---   [12] luatex-basics-gen.lua
+---   [13] data-con.lua
+---   [14] luatex-basics-nod.lua
+---   [15] luatex-basics-chr.lua
+---   [16] font-ini.lua
+---   [17] font-con.lua
+---   [18] luatex-fonts-enc.lua
+---   [19] font-cid.lua
+---   [20] font-map.lua
+---   [21] luatex-fonts-syn.lua
+---   [22] font-tfm.lua
+---   [23] font-afm.lua
+---   [24] font-afk.lua
+---   [25] font-oti.lua
+---   [26] font-otr.lua
+---   [27] font-cff.lua
+---   [28] font-ttf.lua
+---   [29] font-dsp.lua
+---   [30] font-oup.lua
+---   [31] font-otl.lua
+---   [32] font-oto.lua
+---   [33] font-otj.lua
+---   [34] font-ota.lua
+---   [35] font-ots.lua
+---   [36] font-osd.lua
+---   [37] font-lua.lua
+---   [38] font-def.lua
+---   [39] font-xtx.lua
+---   [40] luatex-fonts-ext.lua
+---   [41] font-gbn.lua
 ---
---- Of these, nos. 01--10 are provided by the Lualibs. Keeping them
+--- Of these, nos. 01--11 are provided by the Lualibs. Keeping them
 --- around in the Luaotfload fontloader is therefore unnecessary.
 --- Packaging needs to account for this difference.
 
@@ -306,12 +328,18 @@ local package = {
     "l-boolean",
     "l-math",
     "util-str",
+    "util-fil",
 
 --- Another file containing auxiliary definitions must be present
 --- prior to initialization of the configuration.
 
     "luatex-basics-gen",
 
+--- We have a custom script for autogenerating data so we don’t use the
+--- definitions from upstream.
+
+    "basics-chr",
+
   }, --[[ [package.optional] ]]
 
 --- The files below constitute the “fontloader proper”. Some of the
@@ -332,19 +360,22 @@ local package = {
     "font-tfm",
     "font-afm",
     "font-afk",
-    "fonts-tfm",
     "font-oti",
-    "font-otf",
-    "font-otb",
-    "font-inj",
-    "fonts-ota",
-    "font-otn",
-    "font-otp",
-    "fonts-lua",
+    "font-otr",
+    "font-cff",
+    "font-ttf",
+    "font-dsp",
+    "font-oup",
+    "font-otl",
+    "font-oto",
+    "font-otj",
+    "font-ota",
+    "font-ots",
+    "font-osd",
+    "font-lua",
     "font-def",
-    "fonts-def",
     "fonts-ext",
-    "fonts-cbk",
+    "font-gbn",
 
   }, --[[ [package.required] ]]
 
@@ -352,7 +383,8 @@ local package = {
 
 local hash_file = function (fname)
   if not lfsisfile (fname) then
-    die ("cannot find %s.", fname)
+    hmm ("cannot find %s", fname)
+    return nil
   end
   local raw = ioloaddata (fname)
   if not raw then
@@ -361,12 +393,27 @@ local hash_file = function (fname)
   return md5sumhexa (raw)
 end
 
+local first_existing_subpath = function (pfx, subs)
+  if not subs then return nil end
+  local t_subs = type (subs)
+  if t_subs == "table" then
+    for i = 1, #subs do
+      local sub = subs[i]
+      local pth = file.join (pfx, sub)
+      if lfsisdir (pth) then return pth end
+    end
+  elseif t_subs == "string" then
+    local pth = file.join (pfx, subs)
+    if lfsisdir (pth) then return pth end
+  end
+  return nil
+end
+
 local derive_category_path = function (cat)
-  local subpath  = origin_paths[cat] or die ("category " .. cat .. " unknown")
-  local location = file.join (parms.context_root, subpath)
-  if not lfsisdir (location) then
-    die ("invalid base path defined for category "
-         .. cat .. " at " .. location)
+  local location = first_existing_subpath (parms.context_root,
+                                           origin_paths[cat])
+  if not location then
+    die ("invalid base path defined for category " .. cat)
   end
   return location
 end
@@ -476,20 +523,21 @@ local news = function ()
         end
         if is_readable (ourpath) then imported = true end
         local src_hash = hash_file (fullpath)
-        local dst_hash = imported and hash_file (ourpath)
-        local same     = src_hash == dst_hash -- same!
-
-        if same then
-          good ("file %s unchanged", emphasis (ourname))
-          status.good[#status.good + 1] = ourname
-        elseif not dst_hash then
-          attention ("new file %s requires import from %s",
-                    emphasis (ourname),
-                    emphasis (fullpath))
-          status.create[#status.create + 1] = ourname
-        else --- src and dst exist but differ
-          attention ("file %s requires import", emphasis (ourname))
-          status.import[#status.import + 1] = ourname
+        if src_hash then
+          local dst_hash = imported and hash_file (ourpath)
+          local same     = src_hash == dst_hash -- same!
+          if same then
+            good ("file %s unchanged", emphasis (ourname))
+            status.good[#status.good + 1] = ourname
+          elseif not dst_hash then
+            attention ("new file %s requires import from %s",
+                      emphasis (ourname),
+                      emphasis (fullpath))
+            status.create[#status.create + 1] = ourname
+          else --- src and dst exist but differ
+            attention ("file %s requires import", emphasis (ourname))
+            status.import[#status.import + 1] = ourname
+          end
         end
       end
 
@@ -541,7 +589,7 @@ local summarize_status = function (counters)
   local sum = imported + skipped + created + failed
   if sum < 1 then die ("garbage total of imported files: %s", sum) end
   separator ()
-  status (" RESULT: %d files processed", sum)
+  status (" RESULT: %d files processed, %d errors", sum, uncertain)
   separator ()
   if created  > 0 then status ("created:  %d (%d %%)", created , created  * 100 / sum) end
   if imported > 0 then status ("imported: %d (%d %%)", imported, imported * 100 / sum) end
@@ -593,7 +641,7 @@ local import = function (arg)
       local def  = defs[i]
       local stat = import_file (def.name, def.kind, def, cat)
       if stat == import_failed then
-        die (stringformat ("import failed at file %d of %d (%s)",
+        hmm (stringformat ("import failed at file %d of %d (%s)",
                            i, ndefs, def.name))
       end
       statcount[stat] = statcount[stat] or 0
@@ -601,7 +649,7 @@ local import = function (arg)
     end
   end
   summarize_status (statcount)
-  return 0
+  return uncertain == 0 and 0 or -42
 end --[[ [local import = function (arg)] ]]
 
 local find_in_path = function (root, subdir, target)
diff --git a/Master/texmf-dist/scripts/luaotfload/mkstatus b/Master/texmf-dist/scripts/luaotfload/mkstatus
index c5ded0d8ec0..f9ff7eb8992 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkstatus
+++ b/Master/texmf-dist/scripts/luaotfload/mkstatus
@@ -5,7 +5,6 @@
 --  DESCRIPTION:  writes the repository state
 -- REQUIREMENTS:  luatex, the lualibs package
 --       AUTHOR:  Philipp Gesang (Phg), <phg42.2a@gmail.com>
---      VERSION:  1.0
 --      CREATED:  2013-07-07 14:01:12+0200
 -----------------------------------------------------------------------
 --
@@ -80,7 +79,6 @@ local names = {
   --- fontloader runtimes
   { rtdir,        "fontloader-basics-gen.lua",      },
   { rtdir,        "fontloader-reference.lua",       },
-  { rtdir,        "fontloader-tl2014.lua",          },
 
   --- fontloader constituents
   { miscdir,      "fontloader-basics-nod.lua",      },
@@ -92,23 +90,30 @@ local names = {
   { miscdir,      "fontloader-font-def.lua",        },
   { miscdir,      "fontloader-font-ini.lua",        },
   { miscdir,      "fontloader-font-map.lua",        },
-  { miscdir,      "fontloader-font-otb.lua",        },
-  { miscdir,      "fontloader-font-otf.lua",        },
   { miscdir,      "fontloader-font-oti.lua",        },
-  { miscdir,      "fontloader-font-otp.lua",        },
-  { miscdir,      "fontloader-fonts-cbk.lua",       },
-  { miscdir,      "fontloader-fonts-def.lua",       },
+  { miscdir,      "fontloader-font-gbn.lua",        },
+  { miscdir,      "fontloader-font-def.lua",        },
   { miscdir,      "fontloader-fonts-demo-vf-1.lua", },
   { miscdir,      "fontloader-fonts-enc.lua",       },
   { miscdir,      "fontloader-fonts-ext.lua",       },
-  { miscdir,      "fontloader-font-inj.lua",        },
   { miscdir,      "fontloader-fonts.lua",           },
-  { miscdir,      "fontloader-fonts-lua.lua",       },
-  { miscdir,      "fontloader-fonts-ota.lua",       },
-  { miscdir,      "fontloader-font-otn.lua",        },
+  { miscdir,      "fontloader-font-lua.lua",        },
   { miscdir,      "fontloader-fonts-syn.lua",       },
-  { miscdir,      "fontloader-fonts-tfm.lua",       },
   { miscdir,      "fontloader-font-tfm.lua",        },
+  { miscdir,      "fontloader-font-tfm.lua",        },
+  { miscdir,      "fontloader-font-otr.lua",        },
+  { miscdir,      "fontloader-font-cff.lua",        },
+  { miscdir,      "fontloader-font-ttf.lua",        },
+  { miscdir,      "fontloader-font-dsp.lua",        },
+  { miscdir,      "fontloader-font-oup.lua",        },
+  { miscdir,      "fontloader-font-otl.lua",        },
+  { miscdir,      "fontloader-font-oto.lua",        },
+  { miscdir,      "fontloader-font-otj.lua",        },
+  { miscdir,      "fontloader-font-ota.lua",        },
+  { miscdir,      "fontloader-font-ots.lua",        },
+  { miscdir,      "fontloader-font-osd.lua",        },
+
+  --- lua libraries
   { miscdir,      "fontloader-languages.lua",       },
   { miscdir,      "fontloader-l-boolean.lua",       },
   { miscdir,      "fontloader-l-file.lua",          },
@@ -125,6 +130,7 @@ local names = {
   { miscdir,      "fontloader-swiglib.lua",         },
   { miscdir,      "fontloader-swiglib-test.lua",    },
   { miscdir,      "fontloader-util-str.lua",        },
+  { miscdir,      "fontloader-util-fil.lua",        },
 
 } --[[local names]]