expose _quarto.modules.typst.css.expand_side_shorthand

Author: gordonwoodhull

dev-docs/feature-format-matrix/qmd-files/css-properties/border/border-width-too-many.qmd

@@ -0,0 +1,31 @@
+---
+format:
+  html:
+    quality: -1
+  pdf:
+    quality: na
+  typst:
+    quality: -1
+    comment: "invalid"
+  dashboard:
+    quality: -1
+  docx:
+    quality: na
+  pptx:
+    quality: na
+keep-typ: true
+_quarto:
+  tests:
+    typst:
+      ensureTypstFileRegexMatches:
+        -
+          - '  \[A\], \[B\]'
+        - []
+---
+
+```{=html}
+<table>
+    <tr><td style="border-width: 1pt 2pt 3pt 4pt 5pt">A</td><td>B</td></tr>
+</table>
+```
+

src/resources/filters/modules/typst_css.lua

@@ -648,6 +648,36 @@ local function consume_color(s, start, warnings)
   return paint, fend + 1
 end
 
+-- the most css thing ever
+local function expand_side_shorthand(items, context, warnings)
+  local sides = {}
+  if #items == 0 then
+    output_warning(warnings, 'no valid ' .. context)
+  elseif #items == 1 then
+    sides.top = items[1]
+    sides.right = items[1]
+    sides.bottom = items[1]
+    sides.left = items[1]
+  elseif #items == 2 then
+    sides.top = items[1]
+    sides.right = items[2]
+    sides.bottom = items[1]
+    sides.left = items[2]
+  elseif #items == 3 then
+    sides.top = items[1]
+    sides.right = items[2]
+    sides.bottom = items[3]
+    sides.left = items[2]
+  elseif #items == 4 then
+    sides.top = items[1]
+    sides.right = items[2]
+    sides.bottom = items[3]
+    sides.left = items[4]
+  else
+    output_warning(warnings, 'too many ' .. context)
+  end
+  return sides
+end
 
 return {
   parse_color = parse_color,
@@ -658,6 +688,7 @@ return {
   output_length = output_length,
   translate_length = translate_length,
   parse_multiple = parse_multiple,
+  expand_side_shorthand = expand_side_shorthand,
   translate_border = translate_border,
   translate_border_width = translate_border_width,
   translate_border_style = translate_border_style,

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

@@ -151,7 +151,8 @@ function render_typst_css_property_processing()
         end
       elseif tcontains(border_properties, part) then
         local items = {}
-        _quarto.modules.typst.css.parse_multiple(v, 4, function(s, start)
+        -- one extra only so we can error on it
+        _quarto.modules.typst.css.parse_multiple(v, 5, function(s, start)
           local item, newstart = border_consumers[part](s, start)
           table.insert(items, item)
           return newstart
@@ -160,32 +161,14 @@ function render_typst_css_property_processing()
           borders[side] = borders[side] or {}
         end
         local xlate = border_translators[part]
-        if #items == 0 then
-          _warnings:insert('no valid ' .. part .. 's in ' .. v)
-        -- the most css thing ever
-        elseif #items == 1 then
-          borders.top[xlate.prop] = items[1]
-          borders.right[xlate.prop] = items[1]
-          borders.bottom[xlate.prop] = items[1]
-          borders.left[xlate.prop] = items[1]
-        elseif #items == 2 then
-          borders.top[xlate.prop] = items[1]
-          borders.right[xlate.prop] = items[2]
-          borders.bottom[xlate.prop] = items[1]
-          borders.left[xlate.prop] = items[2]
-        elseif #items == 3 then
-          borders.top[xlate.prop] = items[1]
-          borders.right[xlate.prop] = items[2]
-          borders.bottom[xlate.prop] = items[3]
-          borders.left[xlate.prop] = items[2]
-        elseif #items == 4 then
-          borders.top[xlate.prop] = items[1]
-          borders.right[xlate.prop] = items[2]
-          borders.bottom[xlate.prop] = items[3]
-          borders.left[xlate.prop] = items[4]
-        else
-          _warnings:insert('too many values in ' .. k .. ' list: ' .. v)
-        end
+        local sides = _quarto.modules.typst.css.expand_side_shorthand(
+          items,
+          part .. 's in ' .. k .. ' list: ' .. v,
+          _warnings)
+        borders.top[xlate.prop] = sides.top
+        borders.right[xlate.prop] = sides.right
+        borders.bottom[xlate.prop] = sides.bottom
+        borders.left[xlate.prop] = sides.left
       else
         _warnings:insert('invalid 2-item border key ' .. k)
       end