diff --git a/docs/src/lib.rs b/docs/src/lib.rs index ca17f6c14..64f5309a2 100644 --- a/docs/src/lib.rs +++ b/docs/src/lib.rs @@ -720,24 +720,24 @@ fn symbols_model(resolver: &dyn Resolver, group: &GroupData) -> SymbolsModel { for (variant, value, deprecation) in symbol.variants() { let value_char = value.parse::().ok(); - let shorthand = |list: &[(&'static str, char)]| { value_char.and_then(|c| { list.iter().copied().find(|&(_, x)| x == c).map(|(s, _)| s) }) }; + let base_char = base_char(value); let name = complete(variant); list.push(SymbolModel { name, markup_shorthand: shorthand(typst::syntax::ast::Shorthand::LIST), math_shorthand: shorthand(typst::syntax::ast::MathShorthand::LIST), - math_class: value_char.and_then(|c| { + math_class: base_char.and_then(|c| { typst_utils::default_math_class(c).map(math_class_name) }), value: value.into(), - accent: value_char + accent: base_char .is_some_and(|c| typst::math::Accent::combine(c).is_some()), alternates: symbol .variants() @@ -778,6 +778,13 @@ pub fn urlify(title: &str) -> EcoString { .collect() } +/// Convert a string to a `char`, ignoring any suffixed variation selectors. +fn base_char(value: &str) -> Option { + value.trim_end_matches(|c: char| { + matches!(c, '\u{180B}'..='\u{180D}' | '\u{180F}' | '\u{FE00}'..='\u{FE0F}' | '\u{E0100}'..='\u{E01EF}') + }).parse::().ok() +} + /// Extract the first line of documentation. fn oneliner(docs: &str) -> EcoString { let paragraph = docs.split("\n\n").next().unwrap_or_default();