From 430f6b1686a18d75c0ff8386c46339f454f82951 Mon Sep 17 00:00:00 2001
From: T0mstone <realt0mstone@gmail.com>
Date: Sat, 26 Jul 2025 14:38:31 +0200
Subject: [PATCH] Require single grapheme cluster

---
 crates/typst-library/src/foundations/symbol.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/crates/typst-library/src/foundations/symbol.rs b/crates/typst-library/src/foundations/symbol.rs
index c2e0a6ec7..05631372b 100644
--- a/crates/typst-library/src/foundations/symbol.rs
+++ b/crates/typst-library/src/foundations/symbol.rs
@@ -7,6 +7,7 @@ use ecow::{EcoString, eco_format};
 use serde::{Serialize, Serializer};
 use typst_syntax::{Span, Spanned, is_ident};
 use typst_utils::hash128;
+use unicode_segmentation::UnicodeSegmentation;
 
 use crate::diag::{DeprecationSink, SourceResult, StrResult, bail, error};
 use crate::foundations::{
@@ -237,14 +238,6 @@ impl Symbol {
         'variants: for (i, &Spanned { ref v, span }) in variants.iter().enumerate() {
             modifiers.clear();
 
-            if v.1.is_empty() {
-                errors.push(if v.0.is_empty() {
-                    error!(span, "empty default variant")
-                } else {
-                    error!(span, "empty variant: {}", v.0.repr())
-                });
-            }
-
             if !v.0.is_empty() {
                 // Collect all modifiers.
                 for modifier in v.0.split('.') {
@@ -406,7 +399,11 @@ pub struct SymbolVariant(EcoString, EcoString);
 
 cast! {
     SymbolVariant,
-    s: EcoString => Self(EcoString::new(), s),
+    s: EcoString => if s.is_empty() || s.graphemes(true).nth(1).is_some() {
+        Err("variant value must be exactly one grapheme cluster")?
+    } else {
+        Self(EcoString::new(), s)
+    },
     array: Array => {
         let mut iter = array.into_iter();
         match (iter.next(), iter.next(), iter.next()) {