padding shorthand for typst logo

and individual control of each side's padding

Author: gordonwoodhull

src/resources/filters/modules/typst.lua

@@ -75,10 +75,26 @@ local function _main()
       return result
     end
   end
+
+  local function as_typst_dictionary(tab)
+    local entries = {}
+    for k, v in _quarto.utils.table.sortedPairs(tab) do
+      if type(v) == 'table' then
+        v = as_typst_dictionary(v)
+      end
+      if k and v then
+        table.insert(entries, k .. ': ' .. v)
+      end
+    end
+    if #entries == 0 then return nil end
+    return '(' .. table.concat(entries, ', ') .. ')'
+  end
 
   return {
     function_call = typst_function_call,
+    sortedPairs = sortedPairs,
     as_typst_content = as_typst_content,
+    as_typst_dictionary = as_typst_dictionary,
     css = require("modules/typst_css")
   }
 end

src/resources/filters/modules/typst_css.lua

@@ -175,6 +175,7 @@ local typst_named_colors = {
   green = '#2ecc40',
   lime = '#01ff70',
 }
+
 -- css can have fraction or percent
 -- typst can have int or percent
 -- what goes for opacity also goes for alpha

src/resources/filters/quarto-post/typst-brand-yaml.lua

@@ -3,26 +3,12 @@ function render_typst_brand_yaml()
     return {}
   end
 
-  local function sortedPairs(t, f)
-    local a = {}
-    for n in pairs(t) do table.insert(a, n) end
-    table.sort(a, f)
-    local i = 0      -- iterator variable
-    local iter = function()   -- iterator function
-        i = i + 1
-        if a[i] == nil then return nil
-        else return a[i], t[a[i]]
-        end
-    end
-    return iter
-  end
-
   local function to_typst_dict_indent(tab, curr, indent)
     curr = curr or ''
     indent = indent or '  '
     local entries = {}
     local inside = curr .. indent
-    for k, v in sortedPairs(tab) do
+    for k, v in _quarto.utils.table.sortedPairs(tab) do
       if type(v) == 'table' then
         v = to_typst_dict_indent(v, inside, indent)
       end
@@ -243,16 +229,63 @@ function render_typst_brand_yaml()
             logoOptions.path = foundLogo.dark.path
             logoOptions.alt = foundLogo.dark.alt
           end
-          -- todo: path relative to brand.yaml
-          logoOptions.padding = _quarto.modules.typst.css.translate_length(logoOptions.padding or '0.5in')
+
+          local pads = {}
+          for k, v in _quarto.utils.table.sortedPairs(logoOptions) do
+            if k == 'padding' then
+              quarto.log.output('foo', k)
+              local widths = {}
+              _quarto.modules.typst.css.parse_multiple(v, 5, function(s, start)
+                local width, newstart = _quarto.modules.typst.css.consume_width(s, start)
+                table.insert(widths, width)
+                return newstart
+              end)
+              local sides = _quarto.modules.typst.css.expand_side_shorthand(
+                widths,
+                'widths in padding list: ' .. v)
+              pads.top = sides.top
+              pads.right = sides.right
+              pads.bottom = sides.bottom
+              pads.left = sides.left
+            elseif k:find '^padding-' then
+              quarto.log.output('foo', k)
+              local _, ndash = k:gsub('-', '')
+              if ndash == 1 then
+                local side = k:match('^padding--(%a+)')
+                local padding_sides = {'left', 'top', 'right', 'bottom'}
+                if tcontains(padding_sides, side) then
+                  pads[side] = _quarto.modules.typst.css.translate_length(v)
+                else
+                  quarto.log.warning('invalid padding key ' .. k)
+                end
+              else
+                quarto.log.warning('invalid padding key ' .. k)
+              end
+            end
+          end
+          local inset = nil
+          if next(pads) then
+            if pads.top == pads.right and
+              pads.right == pads.bottom and
+              pads.bottom == pads.left
+            then
+              inset = pads.top
+            elseif pads.top == pads.bottom and pads.left == pads.right then
+              inset = _quarto.modules.typst.as_typst_dictionary({x = pads.left, y = pads.top})
+            else
+              inset = _quarto.modules.typst.as_typst_dictionary(pads)
+            end
+          else
+            inset = '0.5in'
+          end
           logoOptions.width = _quarto.modules.typst.css.translate_length(logoOptions.width or '2in')
           logoOptions.location = logoOptions.location and
             location_to_typst_align(logoOptions.location) or 'left+top'
           quarto.log.debug('logo options', logoOptions)
           local altProp = logoOptions.alt and (', alt: "' .. logoOptions.alt .. '"') or ''
           local dblbackslash = string.gsub(logoOptions.path, '\\', '\\\\') -- double backslash?
           quarto.doc.include_text('in-header',
-            '#set page(background: align(' .. logoOptions.location .. ', box(inset: ' .. logoOptions.padding .. ', image("' .. dblbackslash .. '", width: ' .. logoOptions.width .. altProp .. '))))')
+            '#set page(background: align(' .. logoOptions.location .. ', box(inset: ' .. inset .. ', image("' .. dblbackslash .. '", width: ' .. logoOptions.width .. altProp .. '))))')
         end  
       end
     end,

src/resources/filters/quarto-post/typst-css-property-processing.lua

@@ -32,20 +32,6 @@ function render_typst_css_property_processing()
     end
   end
 
-  local function sortedPairs(t, f)
-    local a = {}
-    for n in pairs(t) do table.insert(a, n) end
-    table.sort(a, f)
-    local i = 0      -- iterator variable
-    local iter = function()   -- iterator function
-        i = i + 1
-        if a[i] == nil then return nil
-        else return a[i], t[a[i]]
-        end
-    end
-    return iter
-  end
-
   local function dequote(s)
     return s:gsub('^["\']', ''):gsub('["\']$', '')
   end
@@ -84,20 +70,6 @@ function render_typst_css_property_processing()
     return nil
   end
 
-  local function to_typst_dict(tab)
-    local entries = {}
-    for k, v in sortedPairs(tab) do
-      if type(v) == 'table' then
-        v = to_typst_dict(v)
-      end
-      if k and v then
-        table.insert(entries, k .. ': ' .. v)
-      end
-    end
-    if #entries == 0 then return nil end
-    return '(' .. table.concat(entries, ', ') .. ')'
-  end
-
   local border_sides = {'left', 'top', 'right', 'bottom'}
   local border_properties = {'width', 'style', 'color'}
   local function all_equal(seq)
@@ -228,7 +200,7 @@ function render_typst_css_property_processing()
       -- inset seems either buggy or hard to get right, see
       -- https://github.com/quarto-dev/quarto-cli/pull/9387#issuecomment-2076015962
       -- if next(paddings) ~= nil then
-      --   cell.attributes['typst:inset'] = to_typst_dict(paddings)
+      --   cell.attributes['typst:inset'] = _quarto.modules.typst.as_typst_dictionary(paddings)
       -- end
 
       -- since e.g. the left side of one cell can override the right side of another
@@ -259,9 +231,9 @@ function render_typst_css_property_processing()
         quarto.log.debug('paints', table.unpack(paints))
         if all_equal(thicknesses) and all_equal(dashes) and all_equal(paints) then
           assert(borders.left)
-          cell.attributes['typst:stroke'] = to_typst_dict(borders.left)
+          cell.attributes['typst:stroke'] = _quarto.modules.typst.as_typst_dictionary(borders.left)
         else
-          cell.attributes['typst:stroke'] = to_typst_dict(borders)
+          cell.attributes['typst:stroke'] = _quarto.modules.typst.as_typst_dictionary(borders)
         end
       end
     end
@@ -291,7 +263,7 @@ function render_typst_css_property_processing()
         hlprops.fill = 'rgb(0,0,0,0)'
       end
       return pandoc.Inlines({
-        pandoc.RawInline('typst', '#highlight' .. to_typst_dict(hlprops) .. '['),
+        pandoc.RawInline('typst', '#highlight' .. _quarto.modules.typst.as_typst_dictionary(hlprops) .. '['),
         span,
         pandoc.RawInline('typst', ']')
       })

src/resources/pandoc/datadir/_utils.lua

@@ -235,6 +235,22 @@ local function tcontains(t, value)
   return false
 end
 
+
+local function sortedPairs(t, f)
+  local a = {}
+  for n in pairs(t) do table.insert(a, n) end
+  table.sort(a, f)
+  local i = 0      -- iterator variable
+  local iter = function()   -- iterator function
+      i = i + 1
+      if a[i] == nil then return nil
+      else return a[i], t[a[i]]
+      end
+  end
+  return iter
+end
+
+
 local function get_type(v)
   local pandoc_type = pandoc.utils.type(v)
   if pandoc_type == "Inline" then
@@ -546,7 +562,8 @@ return {
   type = get_type,
   table = {
     isarray = tisarray,
-    contains = tcontains
+    contains = tcontains,
+    sortedPairs = sortedPairs
   },
   as_inlines = as_inlines,
   as_blocks = as_blocks,

tests/docs/smoke-all/typst/brand-yaml/logo/padding-xy/_brand.yml

@@ -0,0 +1,13 @@
+logo:
+  images:
+    large-light: quarto.png
+  large: large-light
+defaults:
+  quarto:
+    format:
+      typst:
+        logo:
+          src: large
+          location: center-top
+          width: 300px
+          padding: 1in

tests/docs/smoke-all/typst/brand-yaml/logo/padding-xy/brand-logo.qmd

@@ -0,0 +1,18 @@
+---
+title: logo background
+format:
+  typst:
+    keep-typ: true
+logo:
+  padding: 1in 2in
+_quarto:
+  tests:
+    typst:
+      ensureTypstFileRegexMatches:
+      -
+        - '#set page\(background: align\(center\+top, box\(inset: \(x: 2in, y: 1\in\), image\("quarto.png", width: 225pt\)\)\)\)'
+      - []
+---
+
+{{< lipsum 4 >}}
+

tests/docs/smoke-all/typst/brand-yaml/logo/padding-xy/quarto.png

@@ -0,0 +1,13 @@
+logo:
+  images:
+    large-light: quarto.png
+  large: large-light
+defaults:
+  quarto:
+    format:
+      typst:
+        logo:
+          src: large
+          location: center-top
+          width: 300px
+          padding: 1in

tests/docs/smoke-all/typst/brand-yaml/logo/padding/_brand.yml

@@ -0,0 +1,20 @@
+---
+title: logo background
+format:
+  typst:
+    keep-typ: true
+logo:
+  padding-left: 4pt
+  padding: 9pt 2pt 3pt 17pt
+  padding-top: 1pt
+_quarto:
+  tests:
+    typst:
+      ensureTypstFileRegexMatches:
+      -
+        - '#set page\(background: align\(center\+top, box\(inset: \(bottom: 3pt, left: 4pt, right: 2pt, top: 1pt\), image\("quarto.png", width: 225pt\)\)\)\)'
+      - []
+---
+
+{{< lipsum 4 >}}
+