From 394dea756716ecea5b764dffc8b10c2de0c3a15c Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Mon, 17 Oct 2016 07:44:43 +0200
Subject: [db,conf,doc] kill off references to FF loader

The config option must go since the FF based code was removed already
some time ago.
---
 doc/luaotfload.conf.rst          |  5 -----
 src/luaotfload-configuration.lua | 19 -------------------
 src/luaotfload-database.lua      |  2 --
 3 files changed, 26 deletions(-)

diff --git a/doc/luaotfload.conf.rst b/doc/luaotfload.conf.rst
index 051ec7f..2af9cec 100644
--- a/doc/luaotfload.conf.rst
+++ b/doc/luaotfload.conf.rst
@@ -142,8 +142,6 @@ Section ``db``
 +-----------------+--------+---------------------------+
 |  update-live    |   b    |  ``true``                 |
 +-----------------+--------+---------------------------+
-|  use-fontforge  |   b    |  ``false``                |
-+-----------------+--------+---------------------------+
 
 The flag ``compress`` determines whether the font index (usually
 ``luaotfload-names.lua[.gz]`` will be stored in compressed forms.
@@ -189,9 +187,6 @@ cannot find a requested font. Those who prefer to update manually using
 **luaotfload-tool** should unset this flag. This option does not affect
 rebuilds due to version mismatch.
 
-The option ``use-fontforge`` had a meaning during the transition to the
-Lua-only Opentype reader. At present it is ignored.
-
 Section ``default-features``
 -----------------------------------------------------------------------
 
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua
index c707b63..8484c62 100644
--- a/src/luaotfload-configuration.lua
+++ b/src/luaotfload-configuration.lua
@@ -203,7 +203,6 @@ local default_config = {
     update_live     = true,
     compress        = true,
     max_fonts       = 2^51,
-    use_fontforge   = false,
   },
   run = {
     anon_sequence  = default_anon_sequence,
@@ -378,21 +377,6 @@ local set_default_features = function ()
   return true
 end
 
-local set_fontforge = function ()
-  local names = fonts.names
-  if not names or not names.use_fontforge then
-    --- happens normally on the first run
-    logreport ("log", 4, "db", "Database not present.")
-    return true
-  end
-  local use_ff = config.luaotfload.db.use_fontforge
-  if use_ff == true then
-      logreport ("both", 0, "db",
-                 "Fontforge loader was requested but not supported anymore.")
-  end
-  return true
-end
-
 reconf_tasks = {
   { "Set the log level"         , set_loglevel         },
   { "Build cache paths"         , build_cache_paths    },
@@ -400,7 +384,6 @@ reconf_tasks = {
   { "Set the font filter"       , set_font_filter      },
   { "Install font name resolver", set_name_resolver    },
   { "Set default features"      , set_default_features },
-  { "Set fontforge"             , set_fontforge        },
 }
 
 -------------------------------------------------------------------------------
@@ -499,7 +482,6 @@ local option_spec = {
       out_t     = number_t, --- TODO int_t from 5.3.x on
       transform = tointeger,
     },
-    use_fontforge = { in_t = boolean_t, },
   },
   run = {
     anon_sequence = {
@@ -723,7 +705,6 @@ local formatters = {
     skip_read      = { false, format_boolean },
     strip          = { false, format_boolean },
     update_live    = { false, format_boolean },
-    use_fontforge  = { false, format_boolean },
   },
   default_features = {
     __default = { true, format_keyval },
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 41080cf..f6ea03e 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -3578,8 +3578,6 @@ local export = {
     erase_cache                 = erase_cache,
     show_cache                  = show_cache,
     find_closest                = find_closest,
-    --- transitionary
-    use_fontforge               = false,
 }
 
 return {
-- 
cgit v1.2.3