From aa091196e037b9ee306476cdeb790ec992fb69d6 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 21 Nov 2015 19:06:46 +0100
Subject: [tool] adapt module name

---
 src/luaotfload-tool.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index e9a434a..ab025b3 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -129,7 +129,7 @@ local backup = {
 }
 
 texio.write, texio.write_nl          = dummy_function, dummy_function
-require "luaotfload-basics-gen.lua"
+require "fontloader-basics-gen.lua"
 
 texio.write, texio.write_nl          = backup.write, backup.write_nl
 utilities                            = backup.utilities
-- 
cgit v1.2.3


From caaf1f3801e41706d1be9cefccddea859e1e4bcb Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 21 Nov 2015 22:17:28 +0100
Subject: [*] update list of contributors

Initially I added credits for Joseph Wright (0ba45a2d9b..) but
``git shortlog`` revealed there were many others still missing
from the list.
---
 README | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README b/README
index 75575d2..19c3bd1 100644
--- a/README
+++ b/README
@@ -33,6 +33,11 @@ Will Robertson           <will.robertson@latex-project.org>
 Philipp Gesang           <philipp.gesang@alumni.uni-heidelberg.de>
 Dohyun Kim               <nomosnomos@gmail.com>
 Reuben Thomas            <https://github.com/rrthomas>
+Joseph Wright            <joseph.wright@morningstar2.co.uk>
+Manuel Pégourié-Gonnard  <mpg@elzevir.fr>
+Olof-Joachim Frahm       <olof@macrolet.net>
+Patrick Gundlach         <gundlach@speedata.de>
+Philipp Stephani         <st_philipp@yahoo.de>
 
 
 Installation
-- 
cgit v1.2.3


From c6e5c892171b526c0bd283737a6207bf443765e2 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 21 Nov 2015 22:20:25 +0100
Subject: [db] adapt log behavior of font path search

---
 src/luaotfload-database.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 1bc2768..2bce001 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -2193,14 +2193,14 @@ local collect_font_filenames_texmf = function ()
     local osfontdir = kpseexpand_path "$OSFONTDIR"
 
     if stringis_empty (osfontdir) then
-        logreport ("info", 1, "db", "Scanning TEXMF for fonts...")
+        logreport ("both", 1, "db", "Scanning TEXMF for fonts...")
     else
-        logreport ("info", 1, "db", "Scanning TEXMF and $OSFONTDIR for fonts...")
+        logreport ("both", 1, "db", "Scanning TEXMF and $OSFONTDIR for fonts...")
         if log.get_loglevel () > 3 then
             local osdirs = filesplitpath (osfontdir)
-            logreport ("info", 0, "db", "$OSFONTDIR has %d entries:", #osdirs)
+            logreport ("both", 0, "db", "$OSFONTDIR has %d entries:", #osdirs)
             for i = 1, #osdirs do
-                logreport ("info", 0, "db", "[%d] %s", i, osdirs[i])
+                logreport ("both", 0, "db", "[%d] %s", i, osdirs[i])
             end
         end
     end
@@ -2214,14 +2214,14 @@ local collect_font_filenames_texmf = function ()
     end
 
     local tasks = filter_out_pwd (filesplitpath (fontdirs))
-    logreport ("info", 3, "db",
+    logreport ("both", 3, "db",
                "Initiating scan of %d directories.", #tasks)
 
     local files = { }
     for _, dir in next, tasks do
         files = tableappend (files, collect_font_filenames_dir (dir, "texmf"))
     end
-    logreport ("term", 3, "db", "Collected %d files.", #files)
+    logreport ("both", 3, "db", "Collected %d files.", #files)
     return files
 end
 
-- 
cgit v1.2.3


From 91c97ddc438c225123cf50ae674931381c0fbf47 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sun, 22 Nov 2015 00:37:26 +0100
Subject: [db] emit message when skipping PWD

---
 src/luaotfload-database.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 2bce001..cc8549e 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -2166,7 +2166,11 @@ local filter_out_pwd = function (dirs)
     for i = 1, #dirs do
         --- better safe than sorry
         local dir = path_normalize (lpegmatch (stripslashes, dirs[i]))
-        if not (dir == "." or dir == pwd) then
+        if dir == "." or dir == pwd then
+            logreport ("both", 3, "db",
+                       "Path “%s” matches $PWD (“%s”), skipping.",
+                       dir, pwd)
+        else
             result[#result+1] = dir
         end
     end
-- 
cgit v1.2.3


From 70eae49c13abe5f01222da49c1c3c93e493083e0 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sun, 22 Nov 2015 00:28:33 +0100
Subject: [db] fix search path construction on Win hosts

This seems to help with the examples from #165 that rely on setting
``$OPENTYPEFONTS`` via the environment.

Referencing a non-existing value caused a branch to always pick Unix
path separators. The affair was pretty insidious since the paths we
received from kpse were sane so the behavior was only triggered with
manual overrides.
---
 src/luaotfload-database.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index cc8549e..35450b5 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -2177,7 +2177,7 @@ local filter_out_pwd = function (dirs)
     return result
 end
 
-local path_separator = ostype == "windows" and ";" or ":"
+local path_separator = os.type == "windows" and ";" or ":"
 
 --[[doc--
 
-- 
cgit v1.2.3