caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

eat trailing percent signs in numbers

Browse Source
This commit is contained in:
Ian Wrzesinski 2025-02-27 10:50:49 -05:00
parent dc54bf43ad
commit 9b9d279a49
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/typst-syntax/src/lexer.rs
View File

@ -871,11 +871,7 @@ impl Lexer<'_> {
}; };
// Read the suffix. // Read the suffix.
let suffix_start = self.s.cursor(); let suffix = self.s.eat_while(|c: char| c.is_ascii_alphanumeric() || c == '%');
if !self.s.eat_if('%') {
self.s.eat_while(char::is_ascii_alphanumeric);
}
let suffix = self.s.from(suffix_start);
let maybe_suffix_result = match suffix { let maybe_suffix_result = match suffix {
"" => None, "" => None,
"pt" | "mm" | "cm" | "in" | "deg" | "rad" | "em" | "fr" | "%" => Some(Ok(())), "pt" | "mm" | "cm" | "in" | "deg" | "rad" | "em" | "fr" | "%" => Some(Ok(())),

BIN
tests/ref/double-percent.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 496 B

5
tests/suite/layout/length.typ
View File

@ -107,7 +107,12 @@
#1.2e-0% #1.2e-0%
#0.0e0deg #0.0e0deg
#0.% #0.%
// Error: 2-6 invalid number suffix: in%
// Hint: 2-6 try adding a space after: `in`
#5in% #5in%
// Error: 2-6 invalid number suffix: %in
// Hint: 2-6 try adding a space after: `%`
#5%in
// Error: 2-8 invalid number suffix: hello // Error: 2-8 invalid number suffix: hello
#1hello #1hello
// Error: 2-7 invalid number suffix: infr // Error: 2-7 invalid number suffix: infr

9
tests/suite/layout/relative.typ
View File

@ -6,10 +6,13 @@
#test((100% + 2pt - 2pt).length, 0pt) #test((100% + 2pt - 2pt).length, 0pt)
#test((56% + 2pt - 56%).ratio, 0%) #test((56% + 2pt - 56%).ratio, 0%)
--- double-percent --- --- double-percent-embedded ---
// Test for two percent signs in a row. // Test for two percent signs in a row.
// Error: 2-7 invalid number suffix: %%
// Hint: 2-7 try adding a space after: `%`
#3.1%% #3.1%%
--- double-percent-error --- --- double-percent-parens ---
// Error: 7-8 the character `%` is not valid in code // Error: 3-8 invalid number suffix: %%
// Hint: 3-8 try adding a space after: `%`
#(3.1%%) #(3.1%%)