mirror of
https://github.com/typst/typst
synced 2025-08-05 18:57:55 +08:00
Compare commits
4 Commits
9941a1e4ff
...
a985817c16
| Author | SHA1 | Date | |
|---|---|---|---|
|
a985817c16 | ||
|
627f5b9d4f | ||
|
|
53d13bae36 | ||
|
|
7057809e23 |
@ -1,5 +1,5 @@
|
||||
use ecow::eco_format;
|
||||
use typst_library::diag::{At, SourceResult};
|
||||
use typst_library::diag::{warning, At, SourceResult};
|
||||
use typst_library::foundations::{Content, NativeElement, Symbol, SymbolElem, Value};
|
||||
use typst_library::math::{
|
||||
AlignPointElem, AttachElem, FracElem, LrElem, PrimesElem, RootElem,
|
||||
@ -80,7 +80,14 @@ impl Eval for ast::MathAttach<'_> {
|
||||
let mut elem = AttachElem::new(base);
|
||||
|
||||
if let Some(expr) = self.top() {
|
||||
elem.t.set(Some(expr.eval_display(vm)?));
|
||||
let top = expr.eval(vm)?;
|
||||
if let Value::Func(_) = top {
|
||||
vm.engine.sink.warn(warning!(
|
||||
expr.span(), "function literal used as superscript";
|
||||
hint: "wrap the entire function call in parentheses",
|
||||
));
|
||||
}
|
||||
elem.t.set(Some(top.display().spanned(self.span())));
|
||||
}
|
||||
|
||||
// Always attach primes in scripts style (not limits style),
|
||||
@ -90,7 +97,14 @@ impl Eval for ast::MathAttach<'_> {
|
||||
}
|
||||
|
||||
if let Some(expr) = self.bottom() {
|
||||
elem.b.set(Some(expr.eval_display(vm)?));
|
||||
let bottom = expr.eval(vm)?;
|
||||
if let Value::Func(_) = bottom {
|
||||
vm.engine.sink.warn(warning!(
|
||||
expr.span(), "function literal used as subscript";
|
||||
hint: "wrap the entire function call in parentheses",
|
||||
));
|
||||
}
|
||||
elem.b.set(Some(bottom.display().spanned(self.span())));
|
||||
}
|
||||
|
||||
Ok(elem.pack())
|
||||
|
||||
@ -14,8 +14,8 @@ use typst_library::model::{
|
||||
RefElem, StrongElem, TableCell, TableElem, TermsElem,
|
||||
};
|
||||
use typst_library::text::{
|
||||
HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SpaceElem, StrikeElem,
|
||||
SubElem, SuperElem, UnderlineElem,
|
||||
HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SmallcapsElem,
|
||||
SpaceElem, StrikeElem, SubElem, SuperElem, UnderlineElem,
|
||||
};
|
||||
use typst_library::visualize::ImageElem;
|
||||
|
||||
@ -47,6 +47,7 @@ pub fn register(rules: &mut NativeRuleMap) {
|
||||
rules.register(Html, OVERLINE_RULE);
|
||||
rules.register(Html, STRIKE_RULE);
|
||||
rules.register(Html, HIGHLIGHT_RULE);
|
||||
rules.register(Html, SMALLCAPS_RULE);
|
||||
rules.register(Html, RAW_RULE);
|
||||
rules.register(Html, RAW_LINE_RULE);
|
||||
|
||||
@ -390,6 +391,20 @@ const STRIKE_RULE: ShowFn<StrikeElem> =
|
||||
const HIGHLIGHT_RULE: ShowFn<HighlightElem> =
|
||||
|elem, _, _| Ok(HtmlElem::new(tag::mark).with_body(Some(elem.body.clone())).pack());
|
||||
|
||||
const SMALLCAPS_RULE: ShowFn<SmallcapsElem> = |elem, _, styles| {
|
||||
Ok(HtmlElem::new(tag::span)
|
||||
.with_attr(
|
||||
attr::style,
|
||||
if elem.all.get(styles) {
|
||||
"font-variant-caps: all-small-caps"
|
||||
} else {
|
||||
"font-variant-caps: small-caps"
|
||||
},
|
||||
)
|
||||
.with_body(Some(elem.body.clone()))
|
||||
.pack())
|
||||
};
|
||||
|
||||
const RAW_RULE: ShowFn<RawElem> = |elem, _, styles| {
|
||||
let lines = elem.lines.as_deref().unwrap_or_default();
|
||||
|
||||
|
||||
@ -384,10 +384,10 @@ fn math_expr_prec(p: &mut Parser, min_prec: usize, stop: SyntaxKind) {
|
||||
fn math_op(kind: SyntaxKind) -> Option<(SyntaxKind, SyntaxKind, ast::Assoc, usize)> {
|
||||
match kind {
|
||||
SyntaxKind::Underscore => {
|
||||
Some((SyntaxKind::MathAttach, SyntaxKind::Hat, ast::Assoc::Right, 2))
|
||||
Some((SyntaxKind::MathAttach, SyntaxKind::Hat, ast::Assoc::Right, 3))
|
||||
}
|
||||
SyntaxKind::Hat => {
|
||||
Some((SyntaxKind::MathAttach, SyntaxKind::Underscore, ast::Assoc::Right, 2))
|
||||
Some((SyntaxKind::MathAttach, SyntaxKind::Underscore, ast::Assoc::Right, 3))
|
||||
}
|
||||
SyntaxKind::Slash => {
|
||||
Some((SyntaxKind::MathFrac, SyntaxKind::End, ast::Assoc::Left, 1))
|
||||
|
||||
10
tests/ref/html/smallcaps-all.html
Normal file
10
tests/ref/html/smallcaps-all.html
Normal file
@ -0,0 +1,10 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
</head>
|
||||
<body>
|
||||
<p><span style="font-variant-caps: small-caps">Test 012</span><br><span style="font-variant-caps: all-small-caps">Test 012</span></p>
|
||||
</body>
|
||||
</html>
|
||||
BIN
tests/ref/math-attach-followed-by-func-call-complex.png
Normal file
BIN
tests/ref/math-attach-followed-by-func-call-complex.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 927 B |
BIN
tests/ref/math-attach-followed-by-func-call-warning.png
Normal file
BIN
tests/ref/math-attach-followed-by-func-call-warning.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 630 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.3 KiB |
@ -34,7 +34,7 @@ $tilde(sum), tilde(sum, size: #50%), accent(H, hat, size: #200%)$
|
||||
|
||||
--- math-accent-sized-script ---
|
||||
// Test accent size in script size.
|
||||
$tilde(U, size: #1.1em), x^tilde(U, size: #1.1em), sscript(tilde(U, size: #1.1em))$
|
||||
$tilde(U, size: #1.1em), x^(tilde(U, size: #1.1em)), sscript(tilde(U, size: #1.1em))$
|
||||
|
||||
--- math-accent-dotless ---
|
||||
// Test dotless glyph variants.
|
||||
|
||||
@ -42,9 +42,41 @@ attach(a, tl: u, t: t, tr: v, bl: x, b: b, br: y)
|
||||
$
|
||||
|
||||
--- math-attach-followed-by-func-call ---
|
||||
// Test function call after subscript.
|
||||
$pi_1(Y), a_f(x), a^zeta (x), a^abs(b)_sqrt(c) \
|
||||
a^subset.eq (x), a_(zeta(x)), pi_(1(Y)), a^(abs(b))_(sqrt(c))$
|
||||
// Test function call after subscripts and superscripts.
|
||||
#set page(width: auto)
|
||||
$a_1(x), a^10(x), a_f(x), a^zeta(x), a_"text"(x),
|
||||
// Warning: 22-25 function literal used as subscript
|
||||
// Hint: 22-25 wrap the entire function call in parentheses
|
||||
// Warning: 32-36 function literal used as superscript
|
||||
// Hint: 32-36 wrap the entire function call in parentheses
|
||||
a_∂(x), a^cos(x), a_abs(x), a^root(2, x), a_subset.eq(x) \
|
||||
a_(1(x)), a^(10(x)), a_(f(x)), a^(zeta(x)), a_("text"(x)),
|
||||
a_(∂(x)), a^(cos(x)), a_(abs(x)), a^(root(2, x)), a_(subset.eq(x))$
|
||||
|
||||
--- math-attach-followed-by-func-call-complex ---
|
||||
// Test function call with named arguments after scripts.
|
||||
#let cross = $c$
|
||||
// Warning: 4-10 function literal used as subscript
|
||||
// Hint: 4-10 wrap the entire function call in parentheses
|
||||
$a_cancel(x, cross: #true)$
|
||||
|
||||
--- math-attach-followed-by-func-call-error ---
|
||||
// Error: 14-19 unknown variable: cross
|
||||
// Hint: 14-19 if you meant to display multiple letters as is, try adding spaces between each letter: `c r o s s`
|
||||
// Hint: 14-19 or if you meant to display this as text, try placing it in quotes: `"cross"`
|
||||
// Warning: 4-10 function literal used as subscript
|
||||
// Hint: 4-10 wrap the entire function call in parentheses
|
||||
$a_cancel(x, cross: #true)$
|
||||
|
||||
--- math-attach-followed-by-func-call-warning ---
|
||||
// Test warning for function literal as subscripts and superscripts.
|
||||
#let myfunc(arg) = $arg$
|
||||
// Warning: 4-10 function literal used as subscript
|
||||
// Hint: 4-10 wrap the entire function call in parentheses
|
||||
$a_myfunc(x) a_(myfunc(x))$
|
||||
// Warning: 4-10 function literal used as subscript
|
||||
// Hint: 4-10 wrap the entire function call in parentheses
|
||||
$a_myfunc a_(myfunc)$
|
||||
|
||||
--- math-attach-nested ---
|
||||
// Test associativity and scaling.
|
||||
|
||||
@ -215,7 +215,7 @@ box[]
|
||||
hello.world
|
||||
hello.world()
|
||||
hello.my.world()
|
||||
f_zeta(x), f_zeta(x)/1
|
||||
f_(zeta(x)), f_(zeta(x))/1
|
||||
emph(hello.my.world())
|
||||
emph(hello.my().world)
|
||||
emph(hello.my().world())
|
||||
|
||||
@ -11,6 +11,6 @@
|
||||
#show smallcaps: set text(fill: red)
|
||||
#smallcaps[Smallcaps]
|
||||
|
||||
--- smallcaps-all ---
|
||||
--- smallcaps-all render html ---
|
||||
#smallcaps(all: false)[Test 012] \
|
||||
#smallcaps(all: true)[Test 012]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user