fix: apply theme font family to text surfaces and geoms (#54)

Author: mcanouil

CHANGELOG.md

@@ -12,6 +12,7 @@
 - feat: `labs()` fields default to `auto`; pass `none` to suppress an axis or legend title and reclaim the space it reserved. (#12)
 - feat: `element-blank()` on a text surface (axis, plot, or legend title) collapses the space the text would reserve. (#12)
 - feat: `width`/`height` accept `auto` to fill the available space of a bounded container. (#10)
+- fix: the `font` set on `element-text`/`element-typst`/`element-geom` is applied to every text surface and to the text-drawing geoms, inheriting the base `text` font when unset. (#54)
 - fix: a `stage`/`after-scale` channel now trains its scale on the marker's source column, so the closure receives the channel's scale-resolved value as documented. (#52)
 - fix: grouped geoms (e.g., `geom-smooth`) no longer panic when a grouping aesthetic is mapped via `after-scale` or `stage`. (#51)
 - fix: facet-grid legends reserve space for a secondary x-axis so a top legend no longer overlaps its ticks. (#46)

src/geom/label.typ

@@ -215,6 +215,10 @@
 
   let g-defaults = geom-defaults(ctx.theme)
   let theme-colour = geom-colour-default(g-defaults)
+  // `none` font keeps the document font; only pass `text(font: ...)` when set.
+  let font-args = if g-defaults.font != none { (font: g-defaults.font) } else {
+    (:)
+  }
   let (default-colour, default-fill) = resolve-pair-defaults(
     layer,
     mapping,
@@ -270,7 +274,7 @@
       stroke: stroke-spec,
       inset: layer.params.inset,
       radius: layer.params.radius,
-      text(size: text-size, fill: text-paint)[#label],
+      text(size: text-size, fill: text-paint, ..font-args)[#label],
     )
     if state.segment-on {
       draw-segment(idx, state.placements.at(idx), state.aabbs, state.seg-cfg)

src/geom/text.typ

@@ -189,7 +189,12 @@
   let y-trained = ctx.trained.at("y", default: none)
   if x-trained == none or y-trained == none { return }
 
-  let theme-colour = geom-colour-default(geom-defaults(ctx.theme))
+  let g-defaults = geom-defaults(ctx.theme)
+  let theme-colour = geom-colour-default(g-defaults)
+  // `none` font keeps the document font; only pass `text(font: ...)` when set.
+  let font-args = if g-defaults.font != none { (font: g-defaults.font) } else {
+    (:)
+  }
   let label-typst = layer
     .at("typst-marks", default: (:))
     .at("label", default: false)
@@ -224,7 +229,7 @@
     }
     cetz.draw.content(
       centre,
-      text(size: text-size, fill: colour)[#label],
+      text(size: text-size, fill: colour, ..font-args)[#label],
       anchor: layer.params.anchor,
     )
   }

src/legend.typ

@@ -16,7 +16,7 @@
 #import "utils/level-resolve.typ": resolve-level
 #import "theme/defaults.typ": resolve-colour
 #import "theme/theme.typ": (
-  _line-stroke, _rect-outset-cm, _rect-style, _text-style,
+  _line-stroke, _rect-outset-cm, _rect-style, _text-args, _text-style,
 )
 #import "guide/draw-key.typ": default-key-for, draw-glyph
 #import "scale/train.typ": mapping-display-name
@@ -1044,19 +1044,15 @@
   }
   cetz.draw.content(
     (tx, cursor),
-    text(
-      size: s.size,
-      fill: s.fill,
-      weight: s.weight,
-    )[#resolve-prose(title, eval-strings: s.typst)],
+    text(.._text-args(s))[#resolve-prose(title, eval-strings: s.typst)],
     anchor: t-anchor,
   )
 }
 
 #let _draw-swatch(guide, ctx, ox, cursor, theme, title-h) = {
   let ink = resolve-colour(theme, "ink")
   let _legend-text = _text-style(theme, "legend-text")
-  let text-colour = _legend-text.fill
+  let legend-text-args = _text-args(_legend-text)
   let text-size = _legend-text.size
   let size-pt = text-size / 1pt
   let line-h = _swatch-line-h-cm(size-pt)
@@ -1111,7 +1107,7 @@
     let (lx, l-anchor) = _hjust-right-of(align, label-start, slot-w)
     cetz.draw.content(
       (lx, cm),
-      text(size: text-size, fill: text-colour)[#label-text],
+      text(..legend-text-args)[#label-text],
       anchor: l-anchor,
     )
   }
@@ -1120,7 +1116,7 @@
 #let _draw-size-ladder(guide, ctx, ox, cursor, theme, title-h) = {
   let ink = resolve-colour(theme, "ink")
   let _legend-text = _text-style(theme, "legend-text")
-  let text-colour = _legend-text.fill
+  let legend-text-args = _text-args(_legend-text)
   let text-size = _legend-text.size
   let size-pt = text-size / 1pt
   let line-h = _ladder-line-h-cm(size-pt)
@@ -1157,7 +1153,7 @@
       let (lx, l-anchor) = _hjust-below(align, cx)
       cetz.draw.content(
         (lx, cy - glyph-size * 2 - 0.1),
-        text(size: text-size, fill: text-colour)[#break-text],
+        text(..legend-text-args)[#break-text],
         anchor: l-anchor,
       )
     }
@@ -1202,7 +1198,7 @@
       )
       cetz.draw.content(
         (lx, cm),
-        text(size: text-size, fill: text-colour)[#break-text],
+        text(..legend-text-args)[#break-text],
         anchor: l-anchor,
       )
     }
@@ -1240,7 +1236,7 @@
   let trained = ctx.trained.at(bar-aes)
   let ink = resolve-colour(theme, "ink")
   let _legend-text = _text-style(theme, "legend-text")
-  let text-colour = _legend-text.fill
+  let legend-text-args = _text-args(_legend-text)
   let text-size = _legend-text.size
   let size-pt = text-size / 1pt
   let (lo, hi) = guide.domain
@@ -1361,7 +1357,7 @@
     }
     cetz.draw.content(
       label-pos,
-      text(size: text-size, fill: text-colour)[#tick-text],
+      text(..legend-text-args)[#tick-text],
       anchor: label-anchor,
     )
   }