More compact layout

2 files changed, 10 insertions, 13 deletions

diff --git a/luaotfload-fonts.lua b/luaotfload-fonts.lua
index aa0d02f..a99d0a0 100644
--- a/luaotfload-fonts.lua
+++ b/luaotfload-fonts.lua
@@ -18,7 +18,7 @@ dofile(kpse.find_file("luaextra.lua"))
 local upper, splitpath, expandpath, glob, basename = string.upper, file.split_path, kpse.expand_path, dir.glob, file.basename
 
 luaotfload.fonts.basename   = "otfl-names.lua"
-luaotfload.fonts.version    = 2.001
+luaotfload.fonts.version    = 2.002
 luaotfload.fonts.log_level  = 1
 
 local function log(lvl, fmt, ...)
@@ -53,22 +53,19 @@ function fontloader.fullinfo(...)
             end
         end
     end
-    if m.pfminfo then
-        t.pfminfo = {
-            weight = m.pfminfo.weight,
-            width  = m.pfminfo.width,
-        }
-    end
     t.fontname    = m.fontname
     t.fullname    = m.fullname
     t.familyname  = m.familyname
     t.filename    = m.origname
-    t.weight      = m.weight
-    t.italicangle = m.italicangle
+    t.weight      = m.pfminfo.weight
+    t.width       = m.pfminfo.width
+    t.slant       = m.italicangle
     -- don't waste the space with zero values
-    t.design_size         = m.design_size         ~= 0 and m.design_size         or nil
-    t.design_range_bottom = m.design_range_bottom ~= 0 and m.design_range_bottom or nil
-    t.design_range_top    = m.design_range_top    ~= 0 and m.design_range_top    or nil
+    t.size = {
+        m.design_size         ~= 0 and m.design_size         or nil,
+        m.design_range_top    ~= 0 and m.design_range_top    or nil,
+        m.design_range_bottom ~= 0 and m.design_range_bottom or nil,
+    }
     return t
 end
 
diff --git a/otfl-font-dum.lua b/otfl-font-dum.lua
index 7dfdf3d..3726036 100644
--- a/otfl-font-dum.lua
+++ b/otfl-font-dum.lua
@@ -47,7 +47,7 @@ end
 
 fonts.names = fonts.names or { }
 
-fonts.names.version    = 2.001 -- not the same as in context
+fonts.names.version    = 2.002 -- not the same as in context
 fonts.names.basename   = "otfl-names.lua"
 fonts.names.new_to_old = { }
 fonts.names.old_to_new = { }