[latex3-commits] [latex3/luaotfload] dev: Revert "Hotfix" (7ed144ec)

github at latex-project.org github at latex-project.org
Thu Dec 28 20:51:40 CET 2023


Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/7ed144eca84b965ef2800957882b95a8bbdb0706

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

commit 7ed144eca84b965ef2800957882b95a8bbdb0706
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Thu Dec 28 20:41:38 2023 +0100

    Revert "Hotfix"
    
    This reverts commit b7e8bf3aeb7ad696dd3f5f87901ec46c00143830.


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

7ed144eca84b965ef2800957882b95a8bbdb0706
 src/auto/fontloader-2023-12-28.lua              | 2 +-
 src/fontloader/misc/fontloader-font-dsp.lua     | 2 +-
 src/fontloader/runtime/fontloader-reference.lua | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/auto/fontloader-2023-12-28.lua b/src/auto/fontloader-2023-12-28.lua
index 45b254cc..56251674 100644
--- a/src/auto/fontloader-2023-12-28.lua
+++ b/src/auto/fontloader-2023-12-28.lua
@@ -15755,7 +15755,7 @@ function readers.colr(f,fontdata,specification)
  local tableoffset=gotodatatable(f,fontdata,"colr",specification.glyphs)
  if tableoffset then
   local version=readushort(f)
-  if version==0 or version==1 then
+  if version~=0 and version~=1 then
    report("table version %a of %a is not supported (yet), maybe font %s is bad",version,"colr",fontdata.filename)
    return
   else
diff --git a/src/fontloader/misc/fontloader-font-dsp.lua b/src/fontloader/misc/fontloader-font-dsp.lua
index e7106fd7..788c5932 100644
--- a/src/fontloader/misc/fontloader-font-dsp.lua
+++ b/src/fontloader/misc/fontloader-font-dsp.lua
@@ -3110,7 +3110,7 @@ function readers.colr(f,fontdata,specification)
     local tableoffset = gotodatatable(f,fontdata,"colr",specification.glyphs)
     if tableoffset then
         local version = readushort(f)
-        if version == 0 or version == 1 then
+        if version ~= 0 and version ~= 1 then
             report("table version %a of %a is not supported (yet), maybe font %s is bad",version,"colr",fontdata.filename)
             return
         else
diff --git a/src/fontloader/runtime/fontloader-reference.lua b/src/fontloader/runtime/fontloader-reference.lua
index 194775b5..8cff7fb9 100644
--- a/src/fontloader/runtime/fontloader-reference.lua
+++ b/src/fontloader/runtime/fontloader-reference.lua
@@ -19310,7 +19310,7 @@ function readers.colr(f,fontdata,specification)
  local tableoffset=gotodatatable(f,fontdata,"colr",specification.glyphs)
  if tableoffset then
   local version=readushort(f)
-  if version==0 or version==1 then
+  if version~=0 and version~=1 then
    report("table version %a of %a is not supported (yet), maybe font %s is bad",version,"colr",fontdata.filename)
    return
   else





More information about the latex3-commits mailing list.