Add math.number element, to separate number vs number-like text in math #7577
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
|
Would this PR make it possible to change the math class of the period back to Punctuation without affecting numbers (#5700)? |
Contributor
Author
|
@MDLC01 this can be done with ease 🎊 by adding these diffs on top of this PR: --- a/crates/typst-utils/src/lib.rs
+++ b/crates/typst-utils/src/lib.rs
@@ -373,7 +373,9 @@ pub fn default_math_class(c: char) -> Option<MathClass> {
// Better spacing.
// https://github.com/typst/typst/pull/1855
- '.' | '/' => Some(MathClass::Normal),
+ '/' => Some(MathClass::Normal),
+
+ '.' => Some(MathClass::Punctuation),
--- a/crates/typst-layout/src/math/text.rs
+++ b/crates/typst-layout/src/math/text.rs
@@ -126,7 +126,10 @@ pub fn layout_number(
// This won't panic as ASCII digits and '.' will never end up as
// nothing after shaping.
- let glyph = GlyphFragment::new_char(ctx, styles, c, span).unwrap();
+ let mut glyph = GlyphFragment::new_char(ctx, styles, c, span).unwrap();
+ if c == '.' {
+ glyph.class = MathClass::Normal;
+ }
fragments.push(glyph.into());
}
let frame = MathRun::new(fragments).into_frame(styles);and I can verify it works as intended :) However, I'd say it's worth opening a separate PR after this current one's acceptance, because this additional change will break these tests and their fix needs more thinking:
|
Contributor
|
I wonder what the consequences would be for numerous packages that generate numbers in equations from strings. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a new math element
math.numberwith the introduction of structNumberElem, so that number (e.g.$2.1$) and number-like text (e.g.$"2.1"$) can be differentiated. A number can contain multiple digits and a decimal point in the middle, as controlled by the lexer'smath_text().This way, as demonstrated in the new ref image
math-number-parsed.png, we can apply a different rendering procedure to the numbers (see the changes in this PR's math/text.rs).This PR fixes #7574 (see the new ref image
issue-7574-footnote-inside-math.png). The footnote notation (e.g.1andnote 2) doesn't really have the semantics of a number in math, and thus should be rendered as text. See comments this and this on that issue.This PR changed the ref image
enum-numbering-closure-nested-complex.png, because a numbered list isn't in a math context, and therefore the bullet point indexes should be rendered as text.This PR changed the code snippet of test
math-attach-nested-baseinattach.typ, because[0]is a content block holding a text of zero, while[$0$]forces the zero to be a number in math context. This difference is also specifically tested in the new testmath-number-parsed(seea0andb0there).CC @mkorje