Release/v0.3.5

.github/workflows/flutter-linux.yml

@@ -32,6 +32,8 @@ jobs:
             bubblewrap \
             clang \
             cmake \
+            fonts-noto-core \
+            fonts-noto-mono \
             ninja-build \
             pkg-config \
             libgtk-3-dev \
@@ -85,6 +87,9 @@ jobs:
       - name: Generate localizations
         run: flutter gen-l10n
 
+      - name: Audit localization catalogs
+        run: flutter test test/src/localization_audit_test.dart
+
       - name: Verify generated files are committed
         run: git diff --exit-code
 
@@ -109,7 +114,9 @@ jobs:
             env WEBKIT_DISABLE_COMPOSITING_MODE=1 LIBGL_ALWAYS_SOFTWARE=1 \
             /usr/bin/python3 -u tools/visualization_smoke.py \
             --assets build/linux/x64/release/bundle/share/busymark/visualization \
-            --d2 build/linux/x64/release/bundle/libexec/busymark/d2
+            --d2 build/linux/x64/release/bundle/libexec/busymark/d2 \
+            --demo test/fixtures/markdown/basic.md \
+            --plantuml-corpus test/fixtures/visualization/plantuml-conformance.md
 
       - name: Exercise the release binary visualization and PDF paths under X11
         run: |
@@ -148,7 +155,9 @@ jobs:
             LIBGL_ALWAYS_SOFTWARE=1 \
             /usr/bin/python3 -u tools/visualization_smoke.py \
             --assets build/linux/x64/release/bundle/share/busymark/visualization \
-            --d2 build/linux/x64/release/bundle/libexec/busymark/d2
+            --d2 build/linux/x64/release/bundle/libexec/busymark/d2 \
+            --demo test/fixtures/markdown/basic.md \
+            --plantuml-corpus test/fixtures/visualization/plantuml-conformance.md
           report="${RUNNER_TEMP}/visualization-release-wayland.json"
           XDG_RUNTIME_DIR="$runtime_dir" WAYLAND_DISPLAY=wayland-99 \
             GDK_BACKEND=wayland BUSYMARK_RELEASE_SMOKE=1 \

assets/export/markdown.typ

@@ -1,39 +1,55 @@
 // BusyMark Markdown PDF renderer. All document data enters through JSON;
 // Markdown text is never evaluated as Typst source.
 #let data = json("document.json")
-#let metadata = data.metadata
+#let document-metadata = data.metadata
 #let options = data.options
 
 #set document(
-  title: metadata.title,
-  author: if metadata.author == "" { () } else { (metadata.author,) },
-  description: metadata.description,
-  keywords: metadata.keywords,
+  title: document-metadata.title,
+  author: if document-metadata.author == "" { () } else { (document-metadata.author,) },
+  description: document-metadata.description,
+  keywords: document-metadata.keywords,
 )
+#assert(data.schemaVersion == 2, message: "Unsupported export payload")
+#let typography = options.typography
+#let geometry = options.page
+#let margins = geometry.marginsPt
+#let content-height = (geometry.heightPt - margins.top - margins.bottom) * 1pt
+#let running-visible() = options.showHeaderFooterOnFirstPage or counter(page).get().first() > 1
+#let number-position = if options.pageNumbers == "bottomLeft" { left } else if options.pageNumbers == "bottomRight" { right } else { center }
 #set page(
-  paper: options.paper,
-  flipped: options.landscape,
-  margin: (
-    x: options.marginHorizontalPt * 1pt,
-    y: options.marginVerticalPt * 1pt,
-  ),
-  numbering: if options.pageNumbers { "1" } else { none },
-  number-align: center + bottom,
+  width: geometry.widthPt * 1pt,
+  height: geometry.heightPt * 1pt,
+  margin: (top: margins.top * 1pt, right: margins.right * 1pt, bottom: margins.bottom * 1pt, left: margins.left * 1pt),
+  // Logical page numbering also supplies native outline page references.
+  // First-page visibility belongs to the running footer, never the numbering
+  // function: an outline on that page must still show its destination numbers.
+  numbering: "1",
+  number-align: number-position + bottom,
+  header: if options.header == "none" { none } else { context { if running-visible() { text(document-metadata.title) } } },
+  footer: if options.footer == "none" and options.pageNumbers == "off" { none } else { context {
+    if running-visible() {
+      // Native page footer content combines title and counter without overlap.
+      if options.footer == "documentTitle" { align(center, text(document-metadata.title)) }
+      if options.pageNumbers != "off" { align(number-position, counter(page).display("1")) }
+    }
+  } },
 )
 #set text(
+  font: typography.bodyFont,
   fallback: true,
-  size: 10.5pt,
-  lang: metadata.language,
+  size: typography.bodySizePt * 1pt,
+  lang: document-metadata.language.split("-").first(),
+  region: if document-metadata.language.split("-").len() == 2 and document-metadata.language.split("-").last().len() == 2 { document-metadata.language.split("-").last() } else { none },
 )
 #set par(leading: 0.68em)
-#set heading(numbering: none)
-#show heading.where(level: 1): set text(size: 22pt, weight: "bold")
-#show heading.where(level: 2): set text(size: 17pt, weight: "bold")
-#show heading.where(level: 3): set text(size: 13.5pt, weight: "bold")
-#show heading.where(level: 4): set text(size: 11.5pt, weight: "bold")
-#show heading.where(level: 5): set text(size: 10.5pt, weight: "bold")
-#show heading.where(level: 6): set text(size: 10.5pt, weight: "bold")
-#show link: set text(fill: rgb("2563a5"))
+#set heading(numbering: if options.content.numberHeadings { "1.1" } else { none })
+#show heading: it => {
+  set text(size: typography.headingSizesPt.at(calc.min(it.level, 6) - 1) * 1pt, weight: "bold")
+  it
+}
+#show raw: set text(font: typography.codeFont, size: typography.codeSizePt * 1pt)
+#show link: set text(fill: rgb(options.accentColor))
 
 #let value-or(item, key, default) = item.at(key, default: default)
 
@@ -102,6 +118,8 @@
       emph(body)
     } else if kind == "underline" {
       underline(body)
+      let summary = value-or(item, "summary", "")
+      if summary != "" { footnote(text(summary)) }
     } else if kind == "strikethrough" {
       strike(body)
     } else if kind == "code" {
@@ -135,34 +153,38 @@
   }
 }
 
+#let render-fitted-image(asset, alt: "", maximum-height: 72% * content-height) = layout(size => {
+  let natural-size = measure(image(asset))
+  let scaled-height = natural-size.height * (size.width / natural-size.width)
+  if scaled-height > maximum-height {
+    image(asset, height: maximum-height, fit: "contain", alt: alt)
+  } else {
+    image(asset, width: 100%, fit: "contain", alt: alt)
+  }
+})
+
 #let render-display-image(item) = {
   let asset = value-or(item, "asset", "")
   let alt = value-or(item, "alt", "")
   if asset == "" {
     emph(text(if alt == "" { "[Image unavailable]" } else { "[Image: " + alt + "]" }))
   } else {
-    layout(size => image(
-      asset,
-      width: 100%,
-      height: 72% * size.height,
-      fit: "contain",
-      alt: alt,
-    ))
+    render-fitted-image(asset, alt: alt)
   }
 }
 
-#let render-table(block-data) = {
+#let render-table(block-data, render) = {
   let rows = value-or(block-data, "children", ())
   if rows.len() == 0 {
     none
   } else {
-    let column-count = calc.max(..rows.map(row => value-or(row, "children", ()).len()))
+    let column-count = value-or(block-data, "columnCount", calc.max(..rows.map(row => value-or(row, "children", ()).len())))
     let cells = ()
     for row in rows {
       let is-header = value-or(row, "header", false)
       let row-cells = ()
       for cell in value-or(row, "children", ()) {
-        let cell-body = render-inlines(value-or(cell, "inlines", ()))
+        let cell-body = [#render-inlines(value-or(cell, "inlines", ()))#for child in value-or(cell, "children", ()) { render(child) }]
         let alignment = value-or(cell, "align", "left")
         let cell-align = if alignment == "center" {
           center
@@ -173,23 +195,26 @@
         }
         row-cells.push(table.cell(
           align: cell-align,
-          if is-header { strong(cell-body) } else { cell-body },
+          x: value-or(cell, "x", auto),
+          y: value-or(cell, "y", auto),
+          colspan: value-or(cell, "colspan", 1),
+          rowspan: value-or(cell, "rowspan", 1),
+          fill: if value-or(cell, "header", is-header) { rgb("f1f3f5") } else { none },
+          if value-or(cell, "header", is-header) { strong(cell-body) } else { cell-body },
         ))
       }
-      for ignored in range(value-or(row, "children", ()).len(), column-count) {
-        row-cells.push(none)
-      }
       if is-header {
         cells.push(table.header(..row-cells))
       } else {
         for cell in row-cells { cells.push(cell) }
       }
     }
     table(
-      columns: column-count,
+      columns: if value-or(block-data, "columnWidths", ()).len() == column-count {
+        value-or(block-data, "columnWidths", ()).map(width => if width != "" { float(width) * 0.75pt } else if value-or(block-data, "fixedColumns", false) { 1fr } else { auto })
+      } else { column-count },
       inset: 5pt,
       stroke: 0.5pt + rgb("c8cdd4"),
-      fill: (x, y) => if y == 0 { rgb("f1f3f5") } else { none },
       ..cells,
     )
   }
@@ -225,14 +250,36 @@
   }
 }
 
+#let render-callout(body, fill: none, accent: black, title: "") = {
+  let content = {
+    if title != "" {
+      strong(title)
+      linebreak()
+    }
+    body
+  }
+  block(
+    width: 100%,
+    above: 0.7em,
+    below: 0.7em,
+    fill: fill,
+    stroke: (left: 2pt + accent),
+    inset: 9pt,
+    radius: 4pt,
+    content,
+  )
+}
+
 #let render-block(block-data) = {
   let kind = block-data.kind
   let inlines = value-or(block-data, "inlines", ())
   let children = value-or(block-data, "children", ())
+  let block-anchor = value-or(block-data, "anchor", "")
+  if block-anchor != "" { [#metadata(block-anchor) #label(block-anchor)] }
   if kind == "heading" {
     let element = heading(
       level: value-or(block-data, "level", 1),
-      outlined: true,
+      outlined: value-or(block-data, "outlined", true),
       render-inlines(inlines),
     )
     let anchor = value-or(block-data, "id", "")
@@ -259,31 +306,47 @@
   } else if kind == "admonition" {
     let style = value-or(block-data, "style", "note")
     let fill = if style == "warning" {
-      rgb("fff4d6")
+      rgb("fff6e9")
     } else if style == "tip" {
-      rgb("e8f7ed")
+      rgb("f0faf4")
     } else {
-      rgb("eaf2fb")
+      rgb("f1f7fd")
     }
-    block(
-      width: 100%,
+    let accent = if style == "warning" {
+      rgb("a34200")
+    } else if style == "tip" {
+      rgb("247550")
+    } else {
+      rgb("2366aa")
+    }
+    let body = if children.len() > 0 {
+      for child in children { render-block(child) }
+    } else {
+      render-inlines(inlines)
+    }
+    let default-title = if style == "warning" {
+      "Warning"
+    } else if style == "tip" {
+      "Tip"
+    } else {
+      "Note"
+    }
+    render-callout(
+      body,
       fill: fill,
-      inset: 9pt,
-      radius: 4pt,
-      if children.len() > 0 {
-        for child in children { render-block(child) }
-      } else {
-        render-inlines(inlines)
-      },
+      accent: accent,
+      title: value-or(block-data, "title", default-title),
     )
   } else if kind == "blockquote" {
-    quote(
-      block: true,
-      if children.len() > 0 {
-        for child in children { render-block(child) }
-      } else {
-        render-inlines(inlines)
-      },
+    let body = if children.len() > 0 {
+      for child in children { render-block(child) }
+    } else {
+      render-inlines(inlines)
+    }
+    render-callout(
+      body,
+      fill: rgb("f5f7fa"),
+      accent: rgb("4b5563"),
     )
   } else if kind == "thematicBreak" {
     block(above: 0.8em, below: 0.8em, line(length: 100%, stroke: 0.6pt + rgb("aeb4bc")))
@@ -328,7 +391,7 @@
       if source.starts-with("https://") { link(source, body) } else { body },
     )
   } else if kind == "table" {
-    render-table(block-data)
+    render-table(block-data, render-block)
   } else if kind == "visualization" {
     let asset = value-or(block-data, "asset", "")
     let alt = value-or(block-data, "alt", "Diagram")
@@ -339,13 +402,11 @@
         above: 0.8em,
         below: 0.8em,
         breakable: false,
-        align(center, layout(size => image(
+        align(center, render-fitted-image(
           asset,
-          width: 100%,
-          height: 70% * size.height,
-          fit: "contain",
           alt: alt,
-        ))),
+          maximum-height: 70% * content-height,
+        )),
       )
     }
   } else if kind == "openApiReference" {
@@ -369,4 +430,9 @@
   }
 }
 
+#if options.content.includeToc {
+  outline(depth: options.content.tocDepth)
+  v(1em)
+}
+
 #for block-data in data.blocks { render-block(block-data) }