[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Deprioritize load-time logging and fix tagging bug (91ba358)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/91ba3580c7cfd430d44b8a5e1f22eb5d24323f1d

>---------------------------------------------------------------

commit 91ba3580c7cfd430d44b8a5e1f22eb5d24323f1d
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Thu Nov 14 22:20:52 2019 +0100

    Deprioritize load-time logging and fix tagging bug


>---------------------------------------------------------------

91ba3580c7cfd430d44b8a5e1f22eb5d24323f1d
 build.lua               | 11 +++++++++--
 src/luaotfload-main.lua |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.lua b/build.lua
index a77365d..eec5046 100644
--- a/build.lua
+++ b/build.lua
@@ -207,6 +207,7 @@ tagfiles = {
             "src/luaotfload.sty",
             "src/luaotfload-*.lua",
             "src/auto/luaotfload-glyphlist.lua",
+            "src/auto/luaotfload-status.lua",
             "doc/luaotfload-main.tex",
             "doc/luaotfload.conf.rst",
             "doc/luaotfload-tool.rst",
@@ -270,6 +271,9 @@ local xxxpackagedatepat = lpeg.Cg( -- Date: YYYYxxxMMxxxDD
 local packageversionpat = lpeg.Cg( -- Version: M.mmmm-dev
   digit * '.' * digit^1 * lpeg.P'-dev'^-1
   * lpeg.Cc(packageversion))
+local imgpackageversionpat = lpeg.Cg( -- Version: M.mmmm--dev
+  digit * '.' * digit^1 * lpeg.P'--dev'^-1
+  * lpeg.Cc(string.gsub(packageversion, '-', '--')))
 local sty_pattern = lpeggsub(tagdatepat * ' v' * packageversionpat)
 local tex_pattern = lpeggsub(packagedatepat * ' v' * packageversionpat)
 local lua_pattern = lpeggsub(
@@ -278,7 +282,8 @@ local lua_pattern = lpeggsub(
     + 'date' * spaces * '=' * spaces
            * '"' * packagedatepat * '",' * spaces * '--TAGDATE')
 local readme_pattern = lpeggsub(
-      (lpeg.P'Version: ' + 'version-' + 'for ') * packageversionpat
+      (lpeg.P'Version: ' + 'for ') * packageversionpat
+    + 'version-' * imgpackageversionpat
     + packagedatepat + imgpackagedatepat)
 local ctanreadme_pattern = lpeggsub(
       'VERSION: ' * packageversionpat
@@ -302,9 +307,11 @@ function update_tag (file,content,_tagname,_tagdate)
                           "caches.namespace = 'generic'",
                           "caches.namespace = 'generic-dev'")
    end
+  elseif file == "luaotfload-status.lua" then
+   return status_pattern:match(content)
   elseif string.match (file, "%.lua$") then
     return lua_pattern:match(content)
-  elseif file == 'README.md$' then
+  elseif file == 'README.md' then
     return readme_pattern:match(content)
   elseif string.match (file, "CTANREADME.md$") then
     return ctanreadme_pattern:match(content)
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua
index aa28f6b..ee462e1 100644
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@ -331,7 +331,7 @@ luaotfload.main = function ()
 
     luaotfload.aux.start_rewrite_fontname () --- to be migrated to fontspec
 
-    logreport ("both", 0, "main",
+    logreport ("log", 1, "main",
                "initialization completed in %0.3f seconds\n",
                osgettimeofday() - starttime)
 ----inspect (timing_info)