Use SymbolElem in more places and add `char` cast for content

8 files changed, 32 insertions, 34 deletions

diff --git a/crates/typst-eval/src/call.rs b/crates/typst-eval/src/call.rs
index 69b274bb..f59235c7 100644
--- a/crates/typst-eval/src/call.rs
+++ b/crates/typst-eval/src/call.rs
@@ -7,12 +7,11 @@ use typst_library::diag::{
 use typst_library::engine::{Engine, Sink, Traced};
 use typst_library::foundations::{
     Arg, Args, Bytes, Capturer, Closure, Content, Context, Func, IntoValue,
-    NativeElement, Scope, Scopes, Value,
+    NativeElement, Scope, Scopes, SymbolElem, Value,
 };
 use typst_library::introspection::Introspector;
 use typst_library::math::LrElem;
 use typst_library::routines::Routines;
-use typst_library::text::TextElem;
 use typst_library::World;
 use typst_syntax::ast::{self, AstNode, Ident};
 use typst_syntax::{Span, Spanned, SyntaxNode};
@@ -402,16 +401,16 @@ fn wrap_args_in_math(
     let mut body = Content::empty();
     for (i, arg) in args.all::<Content>()?.into_iter().enumerate() {
         if i > 0 {
-            body += TextElem::packed(',');
+            body += SymbolElem::packed(',');
         }
         body += arg;
     }
     if trailing_comma {
-        body += TextElem::packed(',');
+        body += SymbolElem::packed(',');
     }
     Ok(Value::Content(
         callee.display().spanned(callee_span)
-            + LrElem::new(TextElem::packed('(') + body + TextElem::packed(')'))
+            + LrElem::new(SymbolElem::packed('(') + body + SymbolElem::packed(')'))
                 .pack()
                 .spanned(args.span),
     ))
diff --git a/crates/typst-eval/src/math.rs b/crates/typst-eval/src/math.rs
index f93f147e..bfb54aa8 100644
--- a/crates/typst-eval/src/math.rs
+++ b/crates/typst-eval/src/math.rs
@@ -1,6 +1,6 @@
 use ecow::eco_format;
 use typst_library::diag::{At, SourceResult};
-use typst_library::foundations::{Content, NativeElement, Symbol, Value};
+use typst_library::foundations::{Content, NativeElement, Symbol, SymbolElem, Value};
 use typst_library::math::{
     AlignPointElem, AttachElem, FracElem, LrElem, PrimesElem, RootElem,
 };
@@ -25,8 +25,7 @@ impl Eval for ast::MathText<'_> {
 
     fn eval(self, _: &mut Vm) -> SourceResult<Self::Output> {
         match self.get() {
-            // TODO: change to `SymbolElem` when added
-            MathTextKind::Character(c) => Ok(Value::Symbol(Symbol::single(c)).display()),
+            MathTextKind::Character(c) => Ok(SymbolElem::packed(c)),
             MathTextKind::Number(text) => Ok(TextElem::packed(text.clone())),
         }
     }
@@ -114,6 +113,7 @@ impl Eval for ast::MathRoot<'_> {
     type Output = Content;
 
     fn eval(self, vm: &mut Vm) -> SourceResult<Self::Output> {
+        // Use `TextElem` to match `MathTextKind::Number` above.
         let index = self.index().map(|i| TextElem::packed(eco_format!("{i}")));
         let radicand = self.radicand().eval_display(vm)?;
         Ok(RootElem::new(radicand).with_index(index).pack())
diff --git a/crates/typst-layout/src/math/attach.rs b/crates/typst-layout/src/math/attach.rs
index 8a67d53b..e1d7d7c9 100644
--- a/crates/typst-layout/src/math/attach.rs
+++ b/crates/typst-layout/src/math/attach.rs
@@ -1,10 +1,9 @@
 use typst_library::diag::SourceResult;
-use typst_library::foundations::{Packed, StyleChain};
+use typst_library::foundations::{Packed, StyleChain, SymbolElem};
 use typst_library::layout::{Abs, Axis, Corner, Frame, Point, Rel, Size};
 use typst_library::math::{
     AttachElem, EquationElem, LimitsElem, PrimesElem, ScriptsElem, StretchElem,
 };
-use typst_library::text::TextElem;
 use typst_utils::OptionExt;
 
 use super::{
@@ -104,13 +103,14 @@ pub fn layout_primes(
                 4 => '⁗',
                 _ => unreachable!(),
             };
-            let f = ctx.layout_into_fragment(&TextElem::packed(c), styles)?;
+            let f = ctx.layout_into_fragment(&SymbolElem::packed(c), styles)?;
             ctx.push(f);
         }
         count => {
             // Custom amount of primes
-            let prime =
-                ctx.layout_into_fragment(&TextElem::packed('′'), styles)?.into_frame();
+            let prime = ctx
+                .layout_into_fragment(&SymbolElem::packed('′'), styles)?
+                .into_frame();
             let width = prime.width() * (count + 1) as f64 / 2.0;
             let mut frame = Frame::soft(Size::new(width, prime.height()));
             frame.set_baseline(prime.ascent());
diff --git a/crates/typst-layout/src/math/frac.rs b/crates/typst-layout/src/math/frac.rs
index 63463d76..6d3caac4 100644
--- a/crates/typst-layout/src/math/frac.rs
+++ b/crates/typst-layout/src/math/frac.rs
@@ -1,5 +1,5 @@
 use typst_library::diag::SourceResult;
-use typst_library::foundations::{Content, Packed, Resolve, StyleChain};
+use typst_library::foundations::{Content, Packed, Resolve, StyleChain, SymbolElem};
 use typst_library::layout::{Em, Frame, FrameItem, Point, Size};
 use typst_library::math::{BinomElem, FracElem};
 use typst_library::text::TextElem;
@@ -80,7 +80,10 @@ fn layout_frac_like(
     let denom = ctx.layout_into_frame(
         &Content::sequence(
             // Add a comma between each element.
-            denom.iter().flat_map(|a| [TextElem::packed(','), a.clone()]).skip(1),
+            denom
+                .iter()
+                .flat_map(|a| [SymbolElem::packed(','), a.clone()])
+                .skip(1),
         ),
         styles.chain(&denom_style),
     )?;
diff --git a/crates/typst-library/src/loading/csv.rs b/crates/typst-library/src/loading/csv.rs
index e5dabfaa..1cf656ae 100644
--- a/crates/typst-library/src/loading/csv.rs
+++ b/crates/typst-library/src/loading/csv.rs
@@ -136,18 +136,10 @@ impl Default for Delimiter {
 cast! {
     Delimiter,
     self => self.0.into_value(),
-    v: EcoString => {
-        let mut chars = v.chars();
-        let first = chars.next().ok_or("delimiter must not be empty")?;
-        if chars.next().is_some() {
-            bail!("delimiter must be a single character");
-        }
-
-        if !first.is_ascii() {
-            bail!("delimiter must be an ASCII character");
-        }
-
-        Self(first)
+    c: char => if c.is_ascii() {
+        Self(c)
+    } else {
+        bail!("delimiter must be an ASCII character")
     },
 }
 
diff --git a/crates/typst-library/src/math/lr.rs b/crates/typst-library/src/math/lr.rs
index 965f5351..7558717a 100644
--- a/crates/typst-library/src/math/lr.rs
+++ b/crates/typst-library/src/math/lr.rs
@@ -1,7 +1,6 @@
-use crate::foundations::{elem, func, Content, NativeElement};
+use crate::foundations::{elem, func, Content, NativeElement, SymbolElem};
 use crate::layout::{Length, Rel};
 use crate::math::Mathy;
-use crate::text::TextElem;
 
 /// Scales delimiters.
 ///
@@ -19,7 +18,7 @@ pub struct LrElem {
     #[parse(
         let mut arguments = args.all::<Content>()?.into_iter();
         let mut body = arguments.next().unwrap_or_default();
-        arguments.for_each(|arg| body += TextElem::packed(',') + arg);
+        arguments.for_each(|arg| body += SymbolElem::packed(',') + arg);
         body
     )]
     pub body: Content,
@@ -125,9 +124,9 @@ fn delimited(
 ) -> Content {
     let span = body.span();
     let mut elem = LrElem::new(Content::sequence([
-        TextElem::packed(left),
+        SymbolElem::packed(left),
         body,
-        TextElem::packed(right),
+        SymbolElem::packed(right),
     ]));
     // Push size only if size is provided
     if let Some(size) = size {
diff --git a/crates/typst-library/src/math/op.rs b/crates/typst-library/src/math/op.rs
index 5b3f58be..55696e53 100644
--- a/crates/typst-library/src/math/op.rs
+++ b/crates/typst-library/src/math/op.rs
@@ -1,6 +1,6 @@
 use ecow::EcoString;
 
-use crate::foundations::{elem, Content, NativeElement, Scope};
+use crate::foundations::{elem, Content, NativeElement, Scope, SymbolElem};
 use crate::layout::HElem;
 use crate::math::{upright, Mathy, THIN};
 use crate::text::TextElem;
@@ -38,6 +38,7 @@ macro_rules! ops {
                 let operator = EcoString::from(ops!(@name $name $(: $value)?));
                 math.define(
                     stringify!($name),
+                    // Latex also uses their equivalent of `TextElem` here.
                     OpElem::new(TextElem::new(operator).into())
                         .with_limits(ops!(@limit $($tts)*))
                         .pack()
@@ -46,7 +47,7 @@ macro_rules! ops {
 
             let dif = |d| {
                 HElem::new(THIN.into()).with_weak(true).pack()
-                    + upright(TextElem::packed(d))
+                    + upright(SymbolElem::packed(d))
             };
             math.define("dif", dif('d'));
             math.define("Dif", dif('D'));
diff --git a/tests/suite/loading/csv.typ b/tests/suite/loading/csv.typ
index 415488fc..93545fc4 100644
--- a/tests/suite/loading/csv.typ
+++ b/tests/suite/loading/csv.typ
@@ -25,3 +25,7 @@
 // Test error numbering with dictionary rows.
 // Error: 6-28 failed to parse CSV (found 3 instead of 2 fields in line 3)
 #csv("/assets/data/bad.csv", row-type: dictionary)
+
+--- csv-invalid-delimiter ---
+// Error: 41-51 delimiter must be an ASCII character
+#csv("/assets/data/zoo.csv", delimiter: "\u{2008}")