From fd90b579a511089cac0187d42552d676e5274982 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Wed, 17 Apr 2013 23:55:03 +0200
Subject: log database version mismatch

---
 otfl-font-nms.lua | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'otfl-font-nms.lua')

diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index 27fd983..2bbaa36 100644
--- a/otfl-font-nms.lua
+++ b/otfl-font-nms.lua
@@ -1,5 +1,5 @@
 if not modules then modules = { } end modules ['font-nms'] = {
-    version   = 1.002,
+    version   = 2.2,
     comment   = "companion to luaotfload.lua",
     author    = "Khaled Hosny and Elie Roux",
     copyright = "Luaotfload Development Team",
@@ -54,7 +54,7 @@ fonts.names          = fonts.names or { }
 
 local names          = fonts.names
 local names_dir      = "luatex-cache/generic/names"
-names.version        = 2.2 -- not the same as in context
+names.version        = 2.2
 names.data           = nil
 names.path           = {
     basename = "otfl-names.lua",
@@ -260,7 +260,15 @@ resolve = function (_,_,specification) -- the 1st two parameters are used by Con
     end
 
     local data = names.data
-    if type(data) == "table" and data.version == names.version then
+    if type(data) == "table" then
+        local db_version, nms_version = data.version, names.version
+        if data.version ~= names.version then
+            report("log", 0, "db",
+                [[version mismatch; expected %4.3f, got %4.3f]],
+                nms_version, db_version
+            )
+            return reload_db(resolve, nil, nil, specification)
+        end
         if data.mappings then
             local found = { }
             local synonym_set = style_synonyms.set
-- 
cgit v1.2.3