From 4b17c3f5c65a3ec87719d3c39d270767140e3767 Mon Sep 17 00:00:00 2001 From: sitandr <60141933+sitandr@users.noreply.github.com> Date: Fri, 12 May 2023 13:26:26 +0300 Subject: [PATCH] Show rules for symbols (fixes #1130) (#1175) --- src/model/styles.rs | 7 +++++-- tests/ref/math/style.png | Bin 19747 -> 20415 bytes tests/typ/compiler/show-node.typ | 2 +- tests/typ/math/style.typ | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/model/styles.rs b/src/model/styles.rs index 334a01b8a..2f33ef929 100644 --- a/src/model/styles.rs +++ b/src/model/styles.rs @@ -472,8 +472,10 @@ pub struct ShowableSelector(pub Selector); impl Cast for ShowableSelector { fn is(value: &Value) -> bool { - matches!(value, Value::Str(_) | Value::Label(_) | Value::Func(_)) - || value.type_name() == "regular expression" + matches!( + value, + Value::Symbol(_) | Value::Str(_) | Value::Label(_) | Value::Func(_) + ) || value.type_name() == "regular expression" || value.type_name() == "selector" } @@ -510,6 +512,7 @@ impl Cast for ShowableSelector { CastInfo::Type("label"), CastInfo::Type("string"), CastInfo::Type("regular expression"), + CastInfo::Type("symbol"), CastInfo::Type("selector"), ]) } diff --git a/tests/ref/math/style.png b/tests/ref/math/style.png index f4a42c70748a805f907d1d432f6fc51c35ef267a..c5e722582fca06d0ec92243783917b92a5ac140d 100644 GIT binary patch delta 4364 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 $#h(1em) it #h(1em)$ +$ a tack b $