From ed50661378f356e02c6ec943bc4840091d33cfbd Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 22 Nov 2021 14:30:43 +0100
Subject: [PATCH] Castable optional and smart values

---
 src/eval/value.rs                  | 144 +++++++++++++++++++++--------
 src/library/deco.rs                |   2 +-
 src/library/mod.rs                 |   8 +-
 src/library/page.rs                |  24 ++---
 src/library/shape.rs               |   6 +-
 src/library/text.rs                |  27 +++---
 src/style/mod.rs                   |  35 +++----
 tests/ref/elements/fill-stroke.png | Bin 0 -> 1942 bytes
 tests/ref/layout/page.png          | Bin 5829 -> 4157 bytes
 tests/ref/layout/pagebreak.png     | Bin 1254 -> 3145 bytes
 tests/typ/elements/fill-stroke.typ |  26 ++++++
 tests/typ/layout/page.typ          |  20 +---
 tests/typ/layout/pagebreak.typ     |  14 +++
 tests/typ/text/features.typ        |   8 ++
 tests/typeset.rs                   |   4 +-
 15 files changed, 215 insertions(+), 103 deletions(-)
 create mode 100644 tests/ref/elements/fill-stroke.png
 create mode 100644 tests/typ/elements/fill-stroke.typ

diff --git a/src/eval/value.rs b/src/eval/value.rs
index e224438ac..dec5c6c0e 100644
--- a/src/eval/value.rs
+++ b/src/eval/value.rs
@@ -252,43 +252,6 @@ pub trait Cast<V>: Sized {
     fn cast(value: V) -> StrResult<Self>;
 }
 
-impl Cast<Value> for Value {
-    fn is(_: &Value) -> bool {
-        true
-    }
-
-    fn cast(value: Value) -> StrResult<Self> {
-        Ok(value)
-    }
-}
-
-impl<T> Cast<Spanned<Value>> for T
-where
-    T: Cast<Value>,
-{
-    fn is(value: &Spanned<Value>) -> bool {
-        T::is(&value.v)
-    }
-
-    fn cast(value: Spanned<Value>) -> StrResult<Self> {
-        T::cast(value.v)
-    }
-}
-
-impl<T> Cast<Spanned<Value>> for Spanned<T>
-where
-    T: Cast<Value>,
-{
-    fn is(value: &Spanned<Value>) -> bool {
-        T::is(&value.v)
-    }
-
-    fn cast(value: Spanned<Value>) -> StrResult<Self> {
-        let span = value.span;
-        T::cast(value.v).map(|t| Spanned::new(t, span))
-    }
-}
-
 /// Implement traits for primitives.
 macro_rules! primitive {
     (
@@ -400,6 +363,113 @@ primitive! { Dict: "dictionary", Dict }
 primitive! { Template: "template", Template }
 primitive! { Function: "function", Func }
 
+impl Cast<Value> for Value {
+    fn is(_: &Value) -> bool {
+        true
+    }
+
+    fn cast(value: Value) -> StrResult<Self> {
+        Ok(value)
+    }
+}
+
+impl<T> Cast<Spanned<Value>> for T
+where
+    T: Cast<Value>,
+{
+    fn is(value: &Spanned<Value>) -> bool {
+        T::is(&value.v)
+    }
+
+    fn cast(value: Spanned<Value>) -> StrResult<Self> {
+        T::cast(value.v)
+    }
+}
+
+impl<T> Cast<Spanned<Value>> for Spanned<T>
+where
+    T: Cast<Value>,
+{
+    fn is(value: &Spanned<Value>) -> bool {
+        T::is(&value.v)
+    }
+
+    fn cast(value: Spanned<Value>) -> StrResult<Self> {
+        let span = value.span;
+        T::cast(value.v).map(|t| Spanned::new(t, span))
+    }
+}
+
+/// A value that can be automatically determined.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+pub enum Smart<T> {
+    /// The value should be determined smartly based on the
+    /// circumstances.
+    Auto,
+    /// A forced, specific value.
+    Custom(T),
+}
+
+impl<T> Smart<T> {
+    /// Returns the contained custom value or a provided default value.
+    pub fn unwrap_or(self, default: T) -> T {
+        match self {
+            Self::Auto => default,
+            Self::Custom(x) => x,
+        }
+    }
+}
+
+impl<T> Default for Smart<T> {
+    fn default() -> Self {
+        Self::Auto
+    }
+}
+
+impl<T> Cast<Value> for Option<T>
+where
+    T: Cast<Value>,
+{
+    fn is(value: &Value) -> bool {
+        matches!(value, Value::None) || T::is(value)
+    }
+
+    fn cast(value: Value) -> StrResult<Self> {
+        match value {
+            Value::None => Ok(None),
+            v => T::cast(v).map(Some).map_err(|msg| with_alternative(msg, "none")),
+        }
+    }
+}
+
+impl<T> Cast<Value> for Smart<T>
+where
+    T: Cast<Value>,
+{
+    fn is(value: &Value) -> bool {
+        matches!(value, Value::Auto) || T::is(value)
+    }
+
+    fn cast(value: Value) -> StrResult<Self> {
+        match value {
+            Value::Auto => Ok(Self::Auto),
+            v => T::cast(v)
+                .map(Self::Custom)
+                .map_err(|msg| with_alternative(msg, "auto")),
+        }
+    }
+}
+
+/// Transform `expected X, found Y` into `expected X or A, found Y`.
+fn with_alternative(msg: String, alt: &str) -> String {
+    let mut parts = msg.split(", found ");
+    if let (Some(a), Some(b)) = (parts.next(), parts.next()) {
+        format!("{} or {}, found {}", a, alt, b)
+    } else {
+        msg
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/library/deco.rs b/src/library/deco.rs
index 1f8c051f2..cb0656892 100644
--- a/src/library/deco.rs
+++ b/src/library/deco.rs
@@ -17,7 +17,7 @@ pub fn overline(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
 }
 
 fn line_impl(args: &mut Args, kind: LineKind) -> TypResult<Value> {
-    let stroke = args.named("stroke")?.or_else(|| args.find()).map(Paint::Solid);
+    let stroke = args.named("stroke")?.or_else(|| args.find());
     let thickness = args.named::<Linear>("thickness")?.or_else(|| args.find());
     let offset = args.named("offset")?;
     let extent = args.named("extent")?.unwrap_or_default();
diff --git a/src/library/mod.rs b/src/library/mod.rs
index 7b8acf9ec..6260e6fcc 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -26,7 +26,7 @@ mod prelude {
     pub use std::rc::Rc;
 
     pub use crate::diag::{At, TypResult};
-    pub use crate::eval::{Args, EvalContext, Template, Value};
+    pub use crate::eval::{Args, EvalContext, Smart, Template, Value};
     pub use crate::frame::*;
     pub use crate::geom::*;
     pub use crate::layout::*;
@@ -144,3 +144,9 @@ dynamic! {
     FontFamily: "font family",
     Value::Str(string) => Self::Named(string.to_lowercase()),
 }
+
+castable! {
+    Paint,
+    Expected: "color",
+    Value::Color(color) => Paint::Solid(color),
+}
diff --git a/src/library/page.rs b/src/library/page.rs
index 20871bd9b..b256a5211 100644
--- a/src/library/page.rs
+++ b/src/library/page.rs
@@ -12,13 +12,13 @@ pub fn page(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
     let paper = args.named::<Paper>("paper")?.or_else(|| args.find());
     let width = args.named("width")?;
     let height = args.named("height")?;
+    let flip = args.named("flip")?;
     let margins = args.named("margins")?;
     let left = args.named("left")?;
     let top = args.named("top")?;
     let right = args.named("right")?;
     let bottom = args.named("bottom")?;
-    let flip = args.named("flip")?;
-    let fill = args.named("fill")?.map(Paint::Solid);
+    let fill = args.named("fill")?;
 
     ctx.template.modify(move |style| {
         let page = style.page_mut();
@@ -33,37 +33,37 @@ pub fn page(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
             page.size.w = width;
         }
 
+        if flip.unwrap_or(false) {
+            std::mem::swap(&mut page.size.w, &mut page.size.h);
+        }
+
         if let Some(height) = height {
             page.class = PaperClass::Custom;
             page.size.h = height;
         }
 
         if let Some(margins) = margins {
-            page.margins = Sides::splat(Some(margins));
+            page.margins = Sides::splat(margins);
         }
 
         if let Some(left) = left {
-            page.margins.left = Some(left);
+            page.margins.left = left;
         }
 
         if let Some(top) = top {
-            page.margins.top = Some(top);
+            page.margins.top = top;
         }
 
         if let Some(right) = right {
-            page.margins.right = Some(right);
+            page.margins.right = right;
         }
 
         if let Some(bottom) = bottom {
-            page.margins.bottom = Some(bottom);
-        }
-
-        if flip.unwrap_or(false) {
-            std::mem::swap(&mut page.size.w, &mut page.size.h);
+            page.margins.bottom = bottom;
         }
 
         if let Some(fill) = fill {
-            page.fill = Some(fill);
+            page.fill = fill;
         }
     });
 
diff --git a/src/library/shape.rs b/src/library/shape.rs
index abf927e46..f47da82f7 100644
--- a/src/library/shape.rs
+++ b/src/library/shape.rs
@@ -58,11 +58,11 @@ fn shape_impl(
     };
 
     // Parse fill & stroke.
-    let fill = args.named("fill")?.map(Paint::Solid);
+    let fill = args.named("fill")?.unwrap_or(None);
     let stroke = match (args.named("stroke")?, args.named("thickness")?) {
         (None, None) => fill.is_none().then(|| default),
-        (color, thickness) => Some(Stroke {
-            paint: color.map(Paint::Solid).unwrap_or(default.paint),
+        (color, thickness) => color.unwrap_or(Some(default.paint)).map(|paint| Stroke {
+            paint,
             thickness: thickness.unwrap_or(default.thickness),
         }),
     };
diff --git a/src/library/text.rs b/src/library/text.rs
index d0b5c8e6c..c0ee80e15 100644
--- a/src/library/text.rs
+++ b/src/library/text.rs
@@ -93,18 +93,16 @@ pub fn font(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
 
     castable! {
         StylisticSet,
-        Expected: "none or integer",
-        Value::None => Self(None),
+        Expected: "integer",
         Value::Int(v) => match v {
-            1 ..= 20 => Self(Some(v as u8)),
+            1 ..= 20 => Self::new(v as u8),
             _ => Err("must be between 1 and 20")?,
         },
     }
 
     castable! {
         NumberType,
-        Expected: "auto or string",
-        Value::Auto => Self::Auto,
+        Expected: "string",
         Value::Str(string) => match string.as_str() {
             "lining" => Self::Lining,
             "old-style" => Self::OldStyle,
@@ -114,8 +112,7 @@ pub fn font(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
 
     castable! {
         NumberWidth,
-        Expected: "auto or string",
-        Value::Auto => Self::Auto,
+        Expected: "string",
         Value::Str(string) => match string.as_str() {
             "proportional" => Self::Proportional,
             "tabular" => Self::Tabular,
@@ -629,8 +626,8 @@ fn tags(features: &FontFeatures) -> Vec<Feature> {
     }
 
     let storage;
-    if let StylisticSet(Some(set @ 1 ..= 20)) = features.stylistic_set {
-        storage = [b's', b's', b'0' + set / 10, b'0' + set % 10];
+    if let Some(set) = features.stylistic_set {
+        storage = [b's', b's', b'0' + set.get() / 10, b'0' + set.get() % 10];
         feat(&storage, 1);
     }
 
@@ -648,15 +645,15 @@ fn tags(features: &FontFeatures) -> Vec<Feature> {
     }
 
     match features.numbers.type_ {
-        NumberType::Auto => {}
-        NumberType::Lining => feat(b"lnum", 1),
-        NumberType::OldStyle => feat(b"onum", 1),
+        Smart::Auto => {}
+        Smart::Custom(NumberType::Lining) => feat(b"lnum", 1),
+        Smart::Custom(NumberType::OldStyle) => feat(b"onum", 1),
     }
 
     match features.numbers.width {
-        NumberWidth::Auto => {}
-        NumberWidth::Proportional => feat(b"pnum", 1),
-        NumberWidth::Tabular => feat(b"tnum", 1),
+        Smart::Auto => {}
+        Smart::Custom(NumberWidth::Proportional) => feat(b"pnum", 1),
+        Smart::Custom(NumberWidth::Tabular) => feat(b"tnum", 1),
     }
 
     match features.numbers.position {
diff --git a/src/style/mod.rs b/src/style/mod.rs
index 4a8830f82..45dbeb546 100644
--- a/src/style/mod.rs
+++ b/src/style/mod.rs
@@ -9,6 +9,7 @@ use std::rc::Rc;
 
 use ttf_parser::Tag;
 
+use crate::eval::Smart;
 use crate::font::*;
 use crate::geom::*;
 use crate::util::EcoString;
@@ -70,7 +71,7 @@ pub struct PageStyle {
     pub size: Size,
     /// The amount of white space on each side of the page. If a side is set to
     /// `None`, the default for the paper class is used.
-    pub margins: Sides<Option<Linear>>,
+    pub margins: Sides<Smart<Linear>>,
     /// The background fill of the page.
     pub fill: Option<Paint>,
 }
@@ -94,7 +95,7 @@ impl Default for PageStyle {
         Self {
             class: paper.class(),
             size: paper.size(),
-            margins: Sides::splat(None),
+            margins: Sides::splat(Smart::Auto),
             fill: None,
         }
     }
@@ -301,7 +302,7 @@ pub struct FontFeatures {
     /// Whether to apply stylistic alternates. ("salt")
     pub alternates: bool,
     /// Which stylistic set to apply. ("ss01" - "ss20")
-    pub stylistic_set: StylisticSet,
+    pub stylistic_set: Option<StylisticSet>,
     /// Configuration of ligature features.
     pub ligatures: LigatureFeatures,
     /// Configuration of numbers features.
@@ -316,7 +317,7 @@ impl Default for FontFeatures {
             kerning: true,
             smallcaps: false,
             alternates: false,
-            stylistic_set: StylisticSet::default(),
+            stylistic_set: None,
             ligatures: LigatureFeatures::default(),
             numbers: NumberFeatures::default(),
             raw: vec![],
@@ -326,11 +327,17 @@ impl Default for FontFeatures {
 
 /// A stylistic set in a font face.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub struct StylisticSet(pub Option<u8>);
+pub struct StylisticSet(u8);
 
-impl Default for StylisticSet {
-    fn default() -> Self {
-        Self(None)
+impl StylisticSet {
+    /// Creates a new set, clamping to 1-20.
+    pub fn new(index: u8) -> Self {
+        Self(index.clamp(1, 20))
+    }
+
+    /// Get the value, guaranteed to be 1-20.
+    pub fn get(self) -> u8 {
+        self.0
     }
 }
 
@@ -359,9 +366,9 @@ impl Default for LigatureFeatures {
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub struct NumberFeatures {
     /// Whether to use lining or old-style numbers.
-    pub type_: NumberType,
+    pub type_: Smart<NumberType>,
     /// Whether to use proportional or tabular numbers.
-    pub width: NumberWidth,
+    pub width: Smart<NumberWidth>,
     /// How to position numbers vertically.
     pub position: NumberPosition,
     /// Whether to have a slash through the zero glyph. ("zero")
@@ -373,8 +380,8 @@ pub struct NumberFeatures {
 impl Default for NumberFeatures {
     fn default() -> Self {
         Self {
-            type_: NumberType::Auto,
-            width: NumberWidth::Auto,
+            type_: Smart::Auto,
+            width: Smart::Auto,
             position: NumberPosition::Normal,
             slashed_zero: false,
             fractions: false,
@@ -385,8 +392,6 @@ impl Default for NumberFeatures {
 /// Which kind of numbers / figures to select.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum NumberType {
-    /// Select the font's preference.
-    Auto,
     /// Numbers that fit well with capital text. ("lnum")
     Lining,
     /// Numbers that fit well into flow of upper- and lowercase text. ("onum")
@@ -396,8 +401,6 @@ pub enum NumberType {
 /// The width of numbers / figures.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum NumberWidth {
-    /// Select the font's preference.
-    Auto,
     /// Number widths are glyph specific. ("pnum")
     Proportional,
     /// All numbers are of equal width / monospaced. ("tnum")
diff --git a/tests/ref/elements/fill-stroke.png b/tests/ref/elements/fill-stroke.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d04b3dd6bf1872a5bcf62a43b412b95b2df5e46
GIT binary patch
literal 1942
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
bPrWx&Bh5069veN;bU(n`-Jf1hjo|$WU7S#s

literal 0
HcmV?d00001

diff --git a/tests/ref/layout/page.png b/tests/ref/layout/page.png
index dae3d48827e0fd227ac8e8bc6b2e0ef8b1467e58..57e4b8f1ad3919cd0106979cfe2cb15cc0d9762c 100644
GIT binary patch
literal 4157
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
TS&EXpwWVOzj#gDr&)EL~&b#|O

literal 5829
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

diff --git a/tests/ref/layout/pagebreak.png b/tests/ref/layout/pagebreak.png
index 043b508645833d686982035cf03a1ffe6b25f424..fbb1d00c5feaa89b8f270c575883ab9ecc6f5563 100644
GIT binary patch
literal 3145
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
CMH?6Z

delta 1039
zcmV+q1n~RG80HC(7G41(2mk;80P)HoSO5S7tw}^dRCwC$-0f|%JQ#-Idjn?!*dS~G
z8_*5N26O}1Al-m&KsSI57=aNy!u`q^OD#hEctqdI<h*_)#4$)du#JfnL<k{-5JCv~
zX7s@VlMoCRfBzSPs?NpzyT?~mdn<~wAPnK#K?kXJZN}XltE6c@uMrbM-Yl6_C%adp
z+21kGzp4=vLi5G39t>fe{mV33)uC-)W>x!E$T)^BqO&j6dCaoWkAk&^UG~;-a<9|!
z`r5Xyu_5TPDb3AI5I4EzM!I#*7}grkB3F^lo&0dbe^5iEb~uu`vaD3KnHVG493?_p
z4TGKJu4=39V`uMOLv6K~Y=?uEuKAsa>pspYGlS}oWKkfbg-aI@{3T)tC;tONc3s|*
zau4AyR<*3m-C@l-IS8lH$AFOJE&;*6xNbdd5!5a{UNx6Jgvm8m`m$856IVF-12r)q
zY=?vYf82>k)_z0?b(>uTHI4RSJ5kLl)oR^M@>mhvY44k>JnbUX`v_I8^;Ku-t?Ltw
z_)E(E3M>+YrCIWEPLR?Mhh!I_6V2|b*Lra6zx!EbkbA5MI){<)0in9sWti8y2(xr<
z9;nmix_qj9ubE>-&`yfC@%54~O>En>!fevlOY!Am>=wb-NYcb#Z)#uq^fuo9YF<2M
zVoXG&a;=?`u&e5ni%7nl+koI~)*7`x`DVSmHb%t!mBB&3C(P4csU7Th4-i(*F(bqt
zlYs&j4LA~k5JCtcgpkj}vKf<+2Q-tQ0xkl0G?Q@xA%FNAglV+rMo6U!o2uIQ+Sw2a
zRPD1XDW<a`xRWf2*!KvHOCmu*Z6?()H0Cm&6+yK&lXUM9mbY2TP}2CXCsUpkK{c&3
zDYpo!l826PS-1MQriGs%4AN^I#={=MAosW?gP$U(YGvHC&}|UxP5QN<53|Er5mfc!
zE)7W*K7WR*LmCXUIXi+o&+f`sOPKk?)gcd^;}H-lDT<=V!nhB^K{XHaL>~smSrOD;
zlHA2)TZGU7bdcuc2;F*`!+6*tI44v1jeA@@;=2f{rSb2R)Ek5>42Q5-nl2|@EZK0|
zph+5<EN$Di&uJJ0sy3IW_T?tmlP;FRXmI0U3K$4WuJ2b!%~ixyk=;igeJky{LtFy<
zr~;D^3>FGUBM?FeA%qa}MU&437-s?qM<eLqzboSW>*G-flKZD6#QERHqY!-S%SitV
zd?<pA><JOSf}rKuCeD9Bi1okmAb{{I2$4NT={FE^b25XUA}o(psvaFd=gh?QIIV*b
zine_&<oz?Z9u2|YKqYy7wtm2^G?Nhw7a;H(2!s$q2q9#f{{WSF)RCfPeboQ}002ov
JPDHLkV1kgZ@<spv

diff --git a/tests/typ/elements/fill-stroke.typ b/tests/typ/elements/fill-stroke.typ
new file mode 100644
index 000000000..b8f2b4bc1
--- /dev/null
+++ b/tests/typ/elements/fill-stroke.typ
@@ -0,0 +1,26 @@
+// Test shape fill & stroke.
+
+---
+#let rect with (width: 20pt, height: 10pt)
+#let items = for i, rect in (
+  rect(stroke: none),
+  rect(),
+  rect(fill: none),
+  rect(thickness: 2pt),
+  rect(stroke: eastern),
+  rect(stroke: eastern, thickness: 2pt),
+  rect(fill: eastern),
+  rect(fill: eastern, stroke: none),
+  rect(fill: forest, stroke: none, thickness: 2pt),
+  rect(fill: forest, stroke: conifer),
+  rect(fill: forest, thickness: 2pt),
+  rect(fill: forest, stroke: conifer, thickness: 2pt),
+) {
+  (align(vertical: center)[{i + 1}.], rect, [])
+}
+
+#grid(
+  columns: (auto, auto, 1fr, auto, auto, 0fr),
+  gutter: 5pt,
+  ..items,
+)
diff --git a/tests/typ/layout/page.typ b/tests/typ/layout/page.typ
index 9bb3097d7..1f707327e 100644
--- a/tests/typ/layout/page.typ
+++ b/tests/typ/layout/page.typ
@@ -26,21 +26,9 @@
 // Flipped predefined paper.
 [#page(paper: "a11", flip: true) Flipped A11]
 
----
-// Test a combination of pages with bodies and normal content.
-
-#page(width: 80pt, height: 30pt)
-
-[#page() First]
-[#page() Second]
-#pagebreak()
-#pagebreak()
-Fourth
-[#page(height: 25pt)]
-Sixth
-[#page() Seventh]
-
 ---
 #page(width: 80pt, height: 40pt, fill: eastern)
-#font(15pt, "Roboto", fill: white, smallcaps: true)
-Typst
+#font(15pt, "Roboto", fill: white, smallcaps: true)[Typst]
+
+#page(width: 40pt, fill: none, margins: auto, top: 10pt)
+Hi
diff --git a/tests/typ/layout/pagebreak.typ b/tests/typ/layout/pagebreak.typ
index ab591c872..f9a935bc7 100644
--- a/tests/typ/layout/pagebreak.typ
+++ b/tests/typ/layout/pagebreak.typ
@@ -18,3 +18,17 @@ C
 // No consequences from the page("A4") call here.
 #pagebreak()
 D
+
+---
+// Test a combination of pages with bodies and normal content.
+
+#page(width: 80pt, height: 30pt)
+
+[#page() First]
+[#page() Second]
+#pagebreak()
+#pagebreak()
+Fourth
+[#page(height: 25pt)]
+Sixth
+[#page() Seventh]
diff --git a/tests/typ/text/features.typ b/tests/typ/text/features.typ
index fc84514b2..d60583d8c 100644
--- a/tests/typ/text/features.typ
+++ b/tests/typ/text/features.typ
@@ -52,10 +52,18 @@ fi vs. #font(ligatures: false)[No fi] \
 #font(features: ("smcp",))[Smcp] \
 fi vs. #font(features: (liga: 0))[No fi]
 
+---
+// Error: 22-27 expected integer or none, found boolean
+#font(stylistic-set: false)
+
 ---
 // Error: 22-24 must be between 1 and 20
 #font(stylistic-set: 25)
 
+---
+// Error: 20-21 expected string or auto, found integer
+#font(number-type: 2)
+
 ---
 // Error: 20-31 expected "lining" or "old-style"
 #font(number-type: "different")
diff --git a/tests/typeset.rs b/tests/typeset.rs
index 723df4a84..6a21cf7b4 100644
--- a/tests/typeset.rs
+++ b/tests/typeset.rs
@@ -10,7 +10,7 @@ use ttf_parser::{GlyphId, OutlineBuilder};
 use walkdir::WalkDir;
 
 use typst::diag::Error;
-use typst::eval::Value;
+use typst::eval::{Smart, Value};
 use typst::font::Face;
 use typst::frame::{Element, Frame, Geometry, Shape, Stroke, Text};
 use typst::geom::{self, Color, Length, Paint, PathElement, RgbaColor, Sides, Size};
@@ -64,7 +64,7 @@ fn main() {
     // large and fit them to match their content.
     let mut style = Style::default();
     style.page_mut().size = Size::new(Length::pt(120.0), Length::inf());
-    style.page_mut().margins = Sides::splat(Some(Length::pt(10.0).into()));
+    style.page_mut().margins = Sides::splat(Smart::Custom(Length::pt(10.0).into()));
     style.text_mut().size = Length::pt(10.0);
 
     // Hook up an assert function into the global scope.