Cast content from string

3 files changed, 30 insertions, 19 deletions

diff --git a/src/eval/args.rs b/src/eval/args.rs
index f507e714..9b21cfa2 100644
--- a/src/eval/args.rs
+++ b/src/eval/args.rs
@@ -44,20 +44,6 @@ impl Args {
         Self { span, items }
     }
 
-    /// Consume and cast the first positional argument.
-    ///
-    /// Returns a `missing argument: {what}` error if no positional argument is
-    /// left.
-    pub fn expect<T>(&mut self, what: &str) -> TypResult<T>
-    where
-        T: Cast<Spanned<Value>>,
-    {
-        match self.eat()? {
-            Some(v) => Ok(v),
-            None => bail!(self.span, "missing argument: {}", what),
-        }
-    }
-
     /// Consume and cast the first positional argument if there is one.
     pub fn eat<T>(&mut self) -> TypResult<Option<T>>
     where
@@ -73,6 +59,20 @@ impl Args {
         Ok(None)
     }
 
+    /// Consume and cast the first positional argument.
+    ///
+    /// Returns a `missing argument: {what}` error if no positional argument is
+    /// left.
+    pub fn expect<T>(&mut self, what: &str) -> TypResult<T>
+    where
+        T: Cast<Spanned<Value>>,
+    {
+        match self.eat()? {
+            Some(v) => Ok(v),
+            None => bail!(self.span, "missing argument: {}", what),
+        }
+    }
+
     /// Find and consume the first castable positional argument.
     pub fn find<T>(&mut self) -> TypResult<Option<T>>
     where
diff --git a/src/eval/func.rs b/src/eval/func.rs
index b72e9f18..73f2cac9 100644
--- a/src/eval/func.rs
+++ b/src/eval/func.rs
@@ -43,11 +43,11 @@ impl Func {
         Self(Arc::new(Repr::Native(Native {
             name,
             func: |ctx, args| {
-                let styles = T::set(args)?;
+                let styles = T::set(args, true)?;
                 let content = T::construct(ctx, args)?;
                 Ok(Value::Content(content.styled_with_map(styles.scoped())))
             },
-            set: Some(T::set),
+            set: Some(|args| T::set(args, false)),
             node: T::SHOWABLE.then(|| NodeId::of::<T>()),
         })))
     }
@@ -165,7 +165,10 @@ pub trait Node: 'static {
     fn construct(ctx: &mut Context, args: &mut Args) -> TypResult<Content>;
 
     /// Parse the arguments into style properties for this node.
-    fn set(args: &mut Args) -> TypResult<StyleMap>;
+    ///
+    /// When `constructor` is true, [`construct`](Self::construct) will run
+    /// after this invocation of `set`.
+    fn set(args: &mut Args, constructor: bool) -> TypResult<StyleMap>;
 }
 
 /// A user-defined closure.
diff --git a/src/eval/value.rs b/src/eval/value.rs
index b5607cfd..dd183926 100644
--- a/src/eval/value.rs
+++ b/src/eval/value.rs
@@ -464,11 +464,19 @@ primitive! { f64: "float", Float, Int(v) => v as f64 }
 primitive! { RawLength: "length", Length }
 primitive! { Angle: "angle", Angle }
 primitive! { Ratio: "ratio", Ratio }
-primitive! { Relative<RawLength>:  "relative length", Relative, Length(v) => v.into(), Ratio(v) => v.into() }
+primitive! { Relative<RawLength>:  "relative length",
+    Relative,
+    Length(v) => v.into(),
+    Ratio(v) => v.into()
+}
 primitive! { Fraction: "fraction", Fraction }
 primitive! { Color: "color", Color }
 primitive! { EcoString: "string", Str }
-primitive! { Content: "content", Content, None => Content::new() }
+primitive! { Content: "content",
+    Content,
+    None => Content::new(),
+    Str(text) => Content::Text(text)
+}
 primitive! { Array: "array", Array }
 primitive! { Dict: "dictionary", Dict }
 primitive! { Func: "function", Func }