lua - fix conditional content for divs with repeated attributes

Author: cscheid

src/resources/filters/customnodes/content-hidden.lua

@@ -36,6 +36,7 @@ _quarto.ast.add_handler({
     local behavior = div.classes:find(constants.kContentVisible) or div.classes:find(constants.kContentHidden)
     local condition = pandoc.List({})
     local remaining_attributes = pandoc.List({})
+    quarto.utils.dump(div.attributes)
     for i, v in ipairs(div.attributes) do
       if kConditions:find(v[1]) ~= nil then
         condition:insert(v)
@@ -79,7 +80,10 @@ _quarto.ast.add_handler({
         error("Ignoring invalid condition in conditional block: " .. v[1])
         -- luacov: enable
       else
-        result.condition[v[1]] = v[2]
+        if result.condition[v[1]] == nil then
+          result.condition[v[1]] = pandoc.List({})
+        end
+        result.condition[v[1]]:insert(v[2])
       end
     end
 
@@ -152,30 +156,47 @@ end
 -- "properties" here will come either from "conditions", in the case of a custom AST node
 -- or from the attributes of the element itself in the case of spans or codeblocks
 function propertiesMatch(properties, profiles)
-  local match = true
-  if properties[constants.kWhenMeta] ~= nil then
-    local v = properties[constants.kWhenMeta]
-    v = split(v, ".") or { v }
-    local r = get_meta(v)
-    match = match and (type(r) == "boolean" and r)
-  end
-  if properties[constants.kUnlessMeta] ~= nil then
-    local v = properties[constants.kUnlessMeta]
+  local function check_meta(value)
+    local v = properties[value]
     v = split(v, ".") or { v }
     local r = get_meta(v)
-    match = match and not (type(r) == "boolean" and r)
-  end
-  if properties[constants.kWhenFormat] ~= nil then
-    match = match and _quarto.format.isFormat(properties[constants.kWhenFormat])
+    return type(r) == "boolean" and r
   end
-  if properties[constants.kUnlessFormat] ~= nil then
-    match = match and not _quarto.format.isFormat(properties[constants.kUnlessFormat])
+  local function check_profile(value)
+    return profiles:includes(value)
   end
-  if properties[constants.kWhenProfile] ~= nil then
-    match = match and profiles:includes(properties[constants.kWhenProfile])
+  local function check_property(key, f)
+    local v = properties[key]
+    if type(v) == "string" then
+      return f(key)
+    elseif type(v) == "table" then
+      local r = false
+      for _, value in ipairs(v) do
+        r = r or f(value)
+      end
+      return r
+    else
+      -- luacov: disable
+      error("Invalid value type for condition: " .. type(v))
+      -- luacov: enable
+    end
   end
-  if properties[constants.kUnlessProfile] ~= nil then
-    match = match and not profiles:includes(properties[constants.kUnlessProfile])
+  local tests = {
+    { constants.kWhenMeta, check_meta, false },
+    { constants.kUnlessMeta, check_meta, true },
+    { constants.kWhenFormat, _quarto.format.isFormat, false },
+    { constants.kUnlessFormat, _quarto.format.isFormat, true },
+    { constants.kWhenProfile, check_profile, false },
+    { constants.kUnlessProfile, check_profile, true }
+  }
+  local match = true
+  for _, test in ipairs(tests) do
+    local key = test[1]
+    local f = test[2]
+    local invert = test[3]
+    if properties[key] ~= nil then
+      match = match and (invert ~= check_property(key, f))
+    end
   end
   return match
 end