From 93d0150fdba1a1e212aafeb4e16faef1cba82d60 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Fri, 14 Feb 2014 23:15:37 +0100
Subject: =?UTF-8?q?[db,main,tool]=20scan=20local=20fonts=20upon=20failed?=
 =?UTF-8?q?=20lookup=20during=20a=20TeX=20run=20(requires=20the=20config?=
 =?UTF-8?q?=20flag=20=E2=80=9Cscan=5Flocal=E2=80=9D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/luaotfload-database.lua | 42 ++++++++++++++++++++++--------------------
 src/luaotfload-main.lua     |  5 +++--
 src/luaotfload-tool.lua     | 11 +++--------
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 54a0398..923f7c5 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -1171,9 +1171,6 @@ resolve_name = function (specification)
                                               name,
                                               style)
     end
-    if not resolved then
-        resolved = specification.name, false
-    end
 
     if not resolved then
         if not fonts_reloaded then
@@ -2934,10 +2931,12 @@ local retrieve_namedata = function (currentnames,
     n_rawnames    = n_rawnames + rawnames
     n_newnames    = n_newnames + new
 
-    rawnames, new = scan_local_fonts (currentnames, targetnames, dry_run)
+    if luaotfloadconfig.scan_local == true then
+        rawnames, new = scan_local_fonts (currentnames, targetnames, dry_run)
 
-    n_rawnames    = n_rawnames + rawnames
-    n_newnames    = n_newnames + new
+        n_rawnames    = n_rawnames + rawnames
+        n_newnames    = n_newnames + new
+    end
 
     return n_rawnames, n_newnames
 end
@@ -3114,8 +3113,8 @@ end
 
 --- dbobj? -> bool? -> bool? -> dbobj
 update_names = function (currentnames, force, dry_run)
-
     local targetnames
+    local n_raw, n_new = 0, 0
 
     if luaotfloadconfig.update_live == false then
         report ("info", 2, "db",
@@ -3124,8 +3123,7 @@ update_names = function (currentnames, force, dry_run)
         return currentnames or name_index
     end
 
-    local starttime                 = osgettimeofday ()
-    local n_rawnames, n_newnames    = 0, 0
+    local starttime = osgettimeofday ()
 
     --[[
     The main function, scans everything
@@ -3164,14 +3162,14 @@ update_names = function (currentnames, force, dry_run)
 
         read_blacklist ()
 
-        local n_raw, n_new = retrieve_namedata (currentnames,
-                                                targetnames,
-                                                dry_run,
-                                                n_rawnames,
-                                                n_newnames)
+        n_raw, n_new = retrieve_namedata (currentnames,
+                                          targetnames,
+                                          dry_run,
+                                          0,
+                                          0)
         report ("info", 3, "db",
                 "Scanned %d font files; %d new entries.",
-                n_rawnames, n_newnames)
+                n_raw, n_new)
     end
 
     --- pass 2 (optional): collect some stats about the raw font info
@@ -3205,11 +3203,15 @@ update_names = function (currentnames, force, dry_run)
 
     if dry_run ~= true then
 
-        local success, reason = save_names ()
-        if not success then
-            report ("both", 0, "db",
-                    "Failed to save database to disk: %s",
-                    reason)
+        if n_new == 0 then
+            report ("info", 2, "db", "No new fonts found, skip saving to disk.")
+        else
+            local success, reason = save_names ()
+            if not success then
+                report ("both", 0, "db",
+                        "Failed to save database to disk: %s",
+                        reason)
+            end
         end
 
         if flush_lookup_cache () and save_lookups () then
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua
index f5f012d..ed7fdd3 100644
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@ -1,10 +1,10 @@
 -----------------------------------------------------------------------
 --         FILE:  luaotfload-main.lua
 --  DESCRIPTION:  Luatex fontloader initialization
--- REQUIREMENTS:  luatex v.0.78 or later, the lualibs package
+-- REQUIREMENTS:  luatex v.0.78 or later; the lualibs package
 --       AUTHOR:  Élie Roux, Khaled Hosny, Philipp Gesang
 --      VERSION:  same as Luaotfload
---     MODIFIED:  2014-02-09 14:42:22+0100
+--     MODIFIED:  2014-02-14 22:51:09+0100
 -----------------------------------------------------------------------
 --
 --- Note:
@@ -59,6 +59,7 @@ config.luaotfload.names_dir       = config.luaotfload.names_dir        or "names
 config.luaotfload.cache_dir       = config.luaotfload.cache_dir        or "fonts"
 config.luaotfload.index_file      = config.luaotfload.index_file       or "luaotfload-names.lua"
 config.luaotfload.formats         = config.luaotfload.formats          or "otf,ttf,ttc,dfont"
+config.luaotfload.scan_local      = config.luaotfload.scan_local == true
 
 if not config.luaotfload.strip then
     config.luaotfload.strip = true
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index d405dc7..f9b9b94 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -723,9 +723,9 @@ set.
 --]]--
 
 local action_sequence = {
-    "loglevel",     "help",  "version", "diagnose",
-    "blacklist",    "cache", "flush",   "generate",
-    "scan_local",   "list",  "query",
+    "loglevel",   "help",  "version", "diagnose",
+    "blacklist",  "cache", "flush",   "generate",
+    "list",       "query",
 }
 
 local action_pending  = tabletohash(action_sequence, false)
@@ -770,11 +770,6 @@ actions.generate = function (job)
     return false, false
 end
 
-actions.scan_local = function (job)
-    names.scan_local_fonts ()
-    return true, true
-end
-
 actions.flush = function (job)
     local success = names.flush_lookup_cache()
     if success then
-- 
cgit v1.2.3