From 7a6d92c7860fd0a606e3efed7b96a81e64f9ebfe Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Tue, 23 Apr 2013 19:59:15 +0200
Subject: set minimum luatex version to 0.76; reduce verbosity of fontdbutil

---
 fontdbutil.lua | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'fontdbutil.lua')

diff --git a/fontdbutil.lua b/fontdbutil.lua
index 31c7dfa..fd01abb 100755
--- a/fontdbutil.lua
+++ b/fontdbutil.lua
@@ -1,11 +1,15 @@
 #!/usr/bin/env texlua
---[[
+
+--[[doc--
 This file was originally written by Elie Roux and Khaled Hosny and is under CC0
 license (see http://creativecommons.org/publicdomain/zero/1.0/legalcode).
 
-This file is a wrapper for the luaotfload's font names module. It is part of the
-luaotfload bundle, please see the luaotfload documentation for more info.
---]]
+This file is a wrapper for the luaotfload font names module
+(luaotfload-database.lua). It is part of the luaotfload bundle, please
+see the luaotfload documentation for more info. Report bugs to
+\url{https://github.com/lualatex/luaotfload/issues}.
+
+--doc]]--
 
 kpse.set_program_name"luatex"
 
@@ -14,18 +18,17 @@ local texiowrite_nl   = texio.write_nl
 local stringfind      = string.find
 local stringlower     = string.lower
 
--- First we need to be able to load module (code copied from
--- luatexbase-loader.sty):
+
 local loader_file = "luatexbase.loader.lua"
 local loader_path = assert(kpse.find_file(loader_file, "lua"),
                            "File '"..loader_file.."' not found")
 
+
 string.quoted = string.quoted or function (str)
   return string.format("%q",str) 
 end
 
---texiowrite_nl("("..loader_path..")")
-dofile(loader_path) -- FIXME this pollutes stdout with filenames
+dofile(loader_path)
 
 --[[doc--
 Depending on how the script is called we change its behavior.
@@ -73,7 +76,19 @@ config.lualibs.prefer_merged    = true
 config.lualibs.load_extended    = false
 
 require"lualibs"
+
+--[[doc--
+\fileent{luatex-basics-gen.lua} calls functions from the
+\luafunction{texio.*} library; too much for our taste.
+We intercept them with dummies.
+--doc]]--
+
+local dummy_function = function ( ) end
+local backup_write, backup_write_nl  = texio.write, texio.write_nl
+texio.write, texio.write_nl          = dummy_function, dummy_function
 require"luaotfload-basics-gen.lua"
+texio.write, texio.write_nl          = backup_write, backup_write_nl
+
 require"luaotfload-override.lua"  --- this populates the logs.* namespace
 require"luaotfload-database"
 require"alt_getopt"
-- 
cgit v1.2.3


From 24a3ecb19d3ca204ac4432e8f2f0b2bf53954b05 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Wed, 24 Apr 2013 18:58:02 +0200
Subject: catch irregular ``file:`` lookups

we now index base names and extensionless base names of font files as
well so as to work around quirks of the Xetex compatibility layer.

this will probably get removed after the syntax parser is redone.
---
 fontdbutil.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'fontdbutil.lua')

diff --git a/fontdbutil.lua b/fontdbutil.lua
index fd01abb..fed1840 100755
--- a/fontdbutil.lua
+++ b/fontdbutil.lua
@@ -85,6 +85,7 @@ We intercept them with dummies.
 
 local dummy_function = function ( ) end
 local backup_write, backup_write_nl  = texio.write, texio.write_nl
+
 texio.write, texio.write_nl          = dummy_function, dummy_function
 require"luaotfload-basics-gen.lua"
 texio.write, texio.write_nl          = backup_write, backup_write_nl
@@ -239,7 +240,7 @@ actions.generate = function (job)
     local fontnames, savedname
     fontnames = names.update(fontnames, job.force_reload)
     logs.names_report("log", 0, "db",
-        "fonts in the database", "%i", #fontnames.mappings)
+        "Fonts in the database: %i", #fontnames.mappings)
     savedname = names.save(fontnames)
     if savedname then --- FIXME have names.save return bool
         return true, true
-- 
cgit v1.2.3