Numbering implementation refactor by samuelireson · Pull Request #6122 · typst/typst

samuelireson · 2025-03-31T14:27:18Z

See previous pr for details.

samuelireson · 2025-03-31T15:00:41Z

Currently, there is a difference between the typst implementation of greek numbering and the css counter style implementation - there is a ' like symbol appended to the numeral if it has 0 in the thousands position. I can't find why this should be the case.

laurmaedje · 2025-04-01T08:58:29Z

There's actually two Greek styles in CSS: lower-greek and greek-lower-modern. The original implementation in Typst was made, I believe, with help of this website: https://www.russellcottrell.com/greek/utilities/GreekNumberConverter.htm

I like how clean the implementation is with the numbering systems, but for Hebrew and Greek there was definitely more going on in the code before than is now, so the old implementation must've implemented something at least somewhat different.

For Roman, Typst used to give N, but now gives 0. I think to make sure these refactors are non-breaking, we should do some automated comparison. E.g. iterating through all numbering systems and for each through all numbers from 0 to 100_000, checking that the output is either matching (or deviating in an expected way if it turns out there was some bug).

samuelireson · 2025-04-01T09:18:11Z

There's actually two Greek styles in CSS: lower-greek and greek-lower-modern.

I saw this too, but it didn't seem that the Typst implementation matched either - would you like to continue to support greek numbering in line with https://www.russellcottrell.com/greek/utilities/GreekNumberConverter.htm , or choose one of the css numbering styles. I guess the latter is not ideal since it would be breaking.

I think to make sure these refactors are non-breaking, we should do some automated comparison. E.g. iterating through all numbering systems and for each through all numbers from 0 to 100_000, checking that the output is either matching (or deviating in an expected way if it turns out there was some bug).

This sounds like a good idea - how would you suggest actually doing this?

laurmaedje · 2025-04-01T10:36:18Z

I saw this too, but it didn't seem that the Typst implementation matched either - would you like to continue to support greek numbering in line with https://www.russellcottrell.com/greek/utilities/GreekNumberConverter.htm , or choose one of the css numbering styles. I guess the latter is not ideal since it would be breaking.

I'm not sure. I would be interested to hear @LuxxxLucy's thoughts who contributed the feature originally.

This sounds like a good idea - how would you suggest actually doing this?

I would do this as a one-off and not keep the code around, so any way is fine really. You could create an extra Rust crate that depends on both your branch and on typst:main and compare both. Or just generate a text file with both main and dev and run diff on it. Something like that.

LuxxxLucy · 2025-04-01T18:03:34Z

That acute like sign is called keraia and is used in modern greek numerals to mainly make it stand out and distinguish as a number (instead of regular text), a short explanation see wiki - Greek Numeral. It is more often to see it used in academic and formal writing.

The css spec is a rather simplified one, and if you remove keraia (both left and right one) you will find that large number (let us say larger than 10000) will be harder to recognize. That being said, a simplified version is definitely not wrong, especially if we are using it for header/section/chapters in typst documents, where we typically will not have huge numbers.

So I would suggest this, try best to keep the keraia (both the lower left and the up right) if possible (btw I like the proposed change, it is neat). But if that is not possible, I think I will probably approve the simplified version (keeps up with the CSS spec).

samuelireson · 2025-04-02T09:01:04Z

Hmm, I am not certain which approach is more appropriate. I would lean towards adhering to the css spec since this is likely what users are expecting/used to anyway, but maybe this is just because the implementation is cleaner! If the choice is made to stick with the current greek numbering, then I don't think this logic could be suitably encapsulated by the standard numbering systems, so we could just keep @LuxxxLucy existing function.

laurmaedje · 2025-04-02T09:45:51Z

@LuxxxLucy Is the keraia similar (as in, being optional, but added for readability) to thousands separators in English (e.g. "1,000,000") or is it a different kind of thing?

samuelireson · 2025-04-02T11:33:24Z

Currently having a look at the changes caused by the refactor, and there are differences for the "circled" numbering kinds. In typst main, single circled numbers are treated as base-50 symbols, so 51 is shown as ①①. I would call this undesirable. The CSS style represents this number as "51", forgetting the symbols. Another case of this occurs in the double circled numbers, but maybe not in a way which is undesirable (at least not totally so). In current typst, 990 -> ⓽⓼⓾ (bad), but 991 -> ⓽⓽⓵ (maybe good?). The refactor would return these cases as "990", and "991".

There are also differences in the greek implementation, and some small differences in hebrew which I am currently investigating.

LuxxxLucy · 2025-04-02T16:07:14Z

@LuxxxLucy Is the keraia similar (as in, being optional, but added for readability) to thousands separators in English (e.g. "1,000,000") or is it a different kind of thing?

yes, I think it is for readability and is optional.

include higher greek terms to support more numbers.

laurmaedje · 2025-04-04T08:49:08Z

Okay, then I think we don't really need as we also don't do the equivalent for Arabic numerals.

samuelireson · 2025-04-04T08:58:10Z

Okay, nice. I will also make a change to the test cases to reflect that. What do you think is a good testing strategy here @laurmaedje? I feel like currently testing seemingly random instances of numbering in each style could be improved, but I'm not really sure what to change to.

laurmaedje · 2025-04-04T11:57:55Z

I agree that the testing right now isn't great, but I also don't have a great idea for persistent tests tbh. For the change itself, comparing against the old version works, but that's not suitable for retained tests unfortunately.

samuelireson · 2025-04-11T12:57:27Z

I have made the changes such that the current tests will pass. As discussed I think there is probably a better way to test this, but there's no reason why this couldn't come in the future.

mohe2015 · 2025-04-11T13:19:53Z

What about committing the expected output and adding a test that compares with this expected output?

samuelireson · 2025-04-11T13:25:55Z

What about committing the expected output and adding a test that compares with this expected output?

Is this not what every test does? Maybe I am not understanding your point. What I am saying is that there should be a better way to test the expected output of a numbering style than simply picking arbitrary numbers and checking them. Something more systematic, perhaps based on the underlying function rather than the list of characters passed to this function.

mohe2015 · 2025-04-11T13:43:11Z

we should do some automated comparison. E.g. iterating through all numbering systems and for each through all numbers from 0 to 100_000, checking that the output is either matching

Oh sorry, I was kind of referencing the quoted part, iterating the first 100k numbers. And then you could commit the current state and if future changes are made this would show the differences then. But now that I think about this more the test file would be like several MB large and the question is also if this would be even worth it depending on how much further changes are made to this in the future. So not worth it I think.

laurmaedje · 2025-04-11T13:50:40Z

I'm also concerned with size. I guess we could commit a hash of the first 10k numbers as a string. That would catch regressions. But it would be pretty opaque if it failed, so probably rather frustrating.

samuelireson · 2025-04-11T15:02:47Z

I guess that's an option but not a great one. I would personally be in favour of leaving the testing how it is now and addressing this later - we aren't losing anything relative to the current state by doing this.

laurmaedje · 2025-06-03T14:15:38Z

No problem.

There are also differences in the greek implementation, and some small differences in hebrew which I am currently investigating.

Greek is cleared up. Did you find out what changed with Hebrew?

samuelireson · 2025-06-03T14:27:34Z

There were similar accents added to the numerals which are unaccounted for on the ready made styles page here. From what I found, it is a similar situation to the Greek accents in that they are not actually necessary for understanding the represented digit.

laurmaedje · 2025-06-03T14:31:43Z

Maybe @emilyyyylime can chime in on the Hebrew topic. TLDR: The old numbering code emitted "א׳" for 1 and the new one emits "א". Similarly, "צ״א" becomes "צא". Is this similar to omitting a thousands separators in English or is the punctuation important and should be kept?

crates/typst-library/src/model/numbering.rs

laurmaedje · 2025-06-03T14:36:00Z

The Hebrew changes seem to go further than just the punctuation. E.g. "תת״ר" becomes "א׳".

samuelireson · 2025-06-03T14:42:53Z

The Hebrew changes seem to go further than just the punctuation. E.g. "תת״ר" becomes "א׳".

which number is this for?

laurmaedje · 2025-06-03T14:43:38Z

which number is this for?

1000

samuelireson · 2025-06-03T14:46:27Z

1000

Okay, I am fairly confident that the new version is correct in this case. I think the old version just didn't define enough numeric representations of characters. The largest numeral was of value 400, which I guess is why there are repeats - 400 + 400 + 200.

samuelireson · 2025-06-03T14:48:08Z

why there are repeats

By this I mean repeated characters in the representation of the digit.

crates/typst-library/src/model/numbering.rs

emilyyyylime · 2025-06-04T08:18:28Z

crates/typst-library/src/model/numbering.rs

+                    ("יט", 19),
+                    ("יח", 18),
+                    ("יז", 17),
+                    ("טז", 16),
+                    ("טו", 15),
+                    ("י", 10),


I take it you've verified this works to preserve the exception for 15 and 16? It seems like it would but I just want to make sure

yes, this works. Do you have any comment regarding the geresh usage in hebrew numbering? Is it similar to comma separation in decimal numbering or is it necessary for understanding?

samuelireson · 2025-06-04T09:33:39Z

sorry for the commit spam, I keep thinking it's the last change that needs to be made.

laurmaedje · 2025-06-04T09:50:11Z

No problem, it will be squashed anyway.

This looks good to me now. Given that @emilyyyylime commented on the code but didn't say anything against the punctuation change (#6122 (comment)), I guess it's fine? I'd wait a bit more in case there's another comment, and then merge.

samuelireson · 2025-06-04T09:54:45Z

great! thanks for the help :)

emilyyyylime · 2025-06-04T10:21:29Z

Sorry yes I was still writing the second comment!

RE ⁨׳⁩ & ⁨״⁩: I've previously shared some thoughts on the matter. However, I think I have since warmed up to the idea of changing the default, especially given the Academy of the Hebrew Language's recommendation on the matter:

remark a: in letters used to denote numbers of mostly chapters, verses, pages, lines, etc.; there is no need to add a Geresh or Gershayim¹

Still I will note it can be preferential in many cases to use the additional marks, and I still think it's necessary to find a long term solution that allows to choose between variations of the same numbering system.

I have more thoughts about א׳ for 1000. For one I think it's wrong when used by itself like this and only works for numbers beyond 1000, as ⁨׳⁩ essentially functions as a digit separator to turn a non-positional system into a positional one in this case (think of the subdivisions of a degree or the Vinculum in Roman Numerals) (so א׳א can be unambiguously 1001 but א׳ just looks like 1. This is ambiguous for any multiple of 1000). I found ⁨א°⁩ (mentioned)[https://he.wikipedia.org/wiki/%D7%A1%D7%A4%D7%A8%D7%95%D7%AA_%D7%A2%D7%91%D7%A8%D7%99%D7%95%D7%AA] once in a table on the Hebrew Wikipedia but couldn't find references to it elsewhere so I would not recommend it.

From my understanding this notation is only really used for marking the year in the Hebrew Calendar, and is most often just omitted for brevity. So many speakers are plain unfamiliar with its meaning (at least I wasn't fully aware of the difference between ה׳תשפ״ה and תשפ״ה). For that reason and because it's rare to count that many items I think it best to omit this part of the PR

https://hebrew-academy.org.il/topic/hahlatot/punctuation/#target-3473 (הערה א) [translation mine] ↩

samuelireson · 2025-06-04T10:44:46Z

That makes sense. Thanks for the detailed answer. In this case do you think I should just remove the weights above 400 - matching the maximally supported number from the previous implementation?

Andrew15-5 · 2025-06-04T13:17:45Z

I still think it's necessary to find a long term solution that allows to choose between variations of the same numbering system.

I think this is just #1177, like #5597 (comment).

emilyyyylime · 2025-06-04T13:24:30Z

LGTM, at least for now.

laurmaedje · 2025-06-04T13:33:03Z

Thanks @samuelireson for the work & patience and @emilyyyylime for the insights!

@samuelireson If you're still motivated, I think we're ready for the next step of #5622 (comment) now. (Though as mentioned, step 2 still warrants some discussion.)

samuelireson · 2025-06-04T13:38:08Z

I'm still interested in moving on to steps 2 and 3 as outlined. Where is a good place for this discussion?

laurmaedje · 2025-06-04T13:44:33Z

We can do it in #5622 or you can open a draft PR and we discuss it there.

… upstream (#1) * Numbering implementation refactor (typst#6122) * Pin colspan and rowspan for blank cells (typst#6401) * Clean up some parser comments (typst#6398) * Autocomplete fixes for math mode (typst#6415) * Update docs for gradient.repeat (typst#6385) * Document how to escape lr delimiter auto-scaling (typst#6410) Co-authored-by: Laurenz <[email protected]> * Improve number lexing (typst#5969) * Report errors in external files (typst#6308) Co-authored-by: Laurenz <[email protected]> * Table multiple headers and subheaders (typst#6168) * Use the shaper in math (typst#6336) * Standardize trailing slashes in docs route paths (typst#6420) * Make a more descriptive definition of `module` (typst#6380) * Specify which CSL style is not suitable for bibliographies (typst#6306) Co-authored-by: Laurenz <[email protected]> * Adjust source file API surface (typst#6423) * Do not force `math.mid` elements to have the Large math class (typst#5980) * List both YAML file extensions in bibliography docs (typst#6426) * Fix panic when test source is not found in world (typst#6428) * Use `codex::ModifierSet` (typst#6159) Co-authored-by: Laurenz <[email protected]> * Render `#super` as `<sup>`, `#sub` as `<sub>` in HTML (typst#6422) * Warning when watching stdin (typst#6381) Co-authored-by: Laurenz <[email protected]> * Fix untidy Cargo.lock * Warn when using variable fonts (typst#6425) * Check that all translation files are added to TRANSLATIONS and ends with newline (typst#6424) Co-authored-by: Laurenz <[email protected]> * Unify `EvalMode` and `LexMode` into `SyntaxMode` (typst#6432) * Consume `data` argument in `pdf.embed()` (typst#6435) * Better error message for compile time string interning failure (typst#6439) * Ensure that label repr is syntactically valid (typst#6456) * Hint for label in both document and bibliography (typst#6457) * Prefer `.yaml` over `.yml` in the docs (typst#6436) * Fix align link in layout documentation (typst#6451) * Fix param autocompletion false positive (typst#6475) * Encode empty attributes with shorthand syntax * Add `Duration::decompose` * Generic casting for `Axes<T>` * More type-safe color conversions * Add `typst_utils::display` * Support for generating native functions at runtime * Typed HTML API (typst#6476) * Consistent codepoint formatting in HTML and PDF error messages * Test runner support for HTML export errors * Turn non-empty void element into export error * Handle pre elements that start with a newline * Extract `write_children` function * Properly handle raw text elements * Fix stroke cap of shapes with partial stroke (typst#5688) * Adding Croatian translations entries (typst#6413) * Rewrite `outline.indent` example (typst#6383) Co-authored-by: Laurenz <[email protected]> * Use ICU data to check if accent is bottom (typst#6393) Co-authored-by: Laurenz <[email protected]> * Add docs for `std` module (typst#6407) Co-authored-by: Laurenz <[email protected]> * Improve equation reference example (typst#6481) * Add page reference customization example (typst#6480) Co-authored-by: Laurenz <[email protected]> * Bump `krilla` to current Git version (typst#6488) Co-authored-by: Laurenz <[email protected]> * Check that git tree is clean after build (typst#6495) * Also fix encoding of `<textarea>` (typst#6497) * Minor fixes to doc comments (typst#6500) * Fix typos in page-setup.md (typst#6499) * Support `in` operator on strings and modules (typst#6498) * Consistent sizing for `html.frame` (typst#6505) * Allow deprecating symbol variants (typst#6441) * Disallow empty labels and references (typst#5776) (typst#6332) Co-authored-by: Laurenz <[email protected]> * Fix nested HTML frames (typst#6509) * Basic support for text decoration functions in HTML (typst#6510) * Improve sentence in guide for LaTeX users (typst#6511) * Sort line items by logical order when constructing frame (typst#5887) Co-authored-by: Laurenz <[email protected]> * Fix panic when sampling across two coincident gradient stops (typst#6166) * Bump `typst-dev-assets` (typst#6514) * Acknowledgements (typst#6528) * Support HTML tests in test-helper extension (typst#6504) * Fix typo in Advanced Styling docs tutorial (typst#6517) * Fix typo in PDF standard CLI help (typst#6518) * Fix typo in PDF standard CLI help part 2 (typst#6531) * Fix minor typo in `array.product` docs (typst#6532) * Fix typos in calc module docs (typst#6535) * Use "subs" and "sups" font features for typographic scripts (typst#5777) * Use punctuation math class for Arabic comma (typst#6537) * Remove duplicate language computation (typst#6557) * Fix typo in PackageStorage (typst#6556) * Fix nightly warnings (typst#6558) * Fix minor typo in function docs (typst#6542) * Refer to json function instead of deprecated json.decode in groups docs (typst#6552) * Rewrite foundations of native elements (typst#6547) * Target-specific native show rules (typst#6569) * Construct library via extension trait instead of default & inherent impl (typst#6576) * Move `html` module to `typst-html` crate (typst#6577) * Fix typo of Typst domain in quote docs (typst#6573) * Anti-alias clip paths (typst#6570) * Use "displayed" instead of "repeated" to avoid ambiguity in numbering docs (typst#6565) * Ignore spans when checking for RawElem equality (typst#6560) * Add `default` argument for `str.first` and `str.last` (typst#6554) Co-authored-by: Laurenz <[email protected]> * Add completions subcommand (typst#6568) * Update Swedish translations based on defaults used for LaTeX and cleveref (typst#6519) * Move math styling to codex and add `math.scr` (typst#6309) * More consistent `Packed<T>` to `Content` conversion methods (typst#6579) * Support images in HTML export (typst#6578) * Fix tooltip for figure reference (typst#6580) * Complete movement of HTML export code to `typst-html` (typst#6584) * Handle `lower` and `upper` in HTML export (typst#6585) * Deduplicate labels for code completion (typst#6516) * Fix regression in reference autocomplete (typst#6586) * Use "whitespace" instead of "space" to denote block-level equation in docs (typst#6591) * Fix minor typo in text docs (typst#6589) * Rephrase docs for truncation of float/decimal to integer (typst#6543) * HTML frame improvements (typst#6605) * Change `enum.item.number` to `Smart` instead of `Option` (typst#6609) * Support setting fonts repeatedly with different `covers` (typst#6604) * Support intra-doc links in HTML (typst#6602) * Partially automate span assignment in native show rule (typst#6613) * Bump `zip` dependency (typst#6615) * Restore timing scopes for native show rules (typst#6616) * Slightly improve selector docs (typst#6544) * Add show rule for smallcaps in HTML (typst#6600) * Mention Tinymist in README.md (typst#6601) * Fix documentation oneliners (typst#6608) * Add rust-analyzer to flake devShell (typst#6618) * Add Lithuanian translations (typst#6587) * Bump CI Rust to 1.88 * Bump MSRV to 1.88 * Migrate to 2024 edition * Fix 2024 clippy warnings * Yeet `if_chain` macro * Reformat with 2024 edition * Add support for PDF embedding (typst#6623) Co-authored-by: Laurenz <[email protected]> * Add `pdf` extension to image autocompletions (typst#6643) * Fix bounding box computation for lines in curves (typst#6647) Co-authored-by: Laurenz <[email protected]> * Lint for iterations over hash types (typst#6652) * Create constructor methods for manifest types (typst#6625) * Remove unnecessary `comemo` dependency in `typst-syntax` (typst#6668) * Remove duplicate center alignment style for equations (typst#6667) * Fix incorrect `vline.x` docs (typst#6657) * Miscellaneous minor docs improvements (typst#6651) Co-authored-by: Laurenz <[email protected]> * Allow explicit autocomplete immediately after comma and colon (typst#6550) * Improve Guide for LaTeX users, Query Function, and replace invisible emojis (typst#6620) Co-authored-by: PgBiel <[email protected]> Co-authored-by: Laurenz <[email protected]> * Hint that deprecated items will be removed in `0.15.0` (typst#6617) * Specify the standard smart quotes for `Arabic` (typst#6626) * Use `rustc-hash` for hash maps and sets (typst#6678) * Faster constraint checking in comemo (bumps comemo & krilla) (typst#6683) * Add `--target` argument for `typst query` (typst#6405) Co-authored-by: Laurenz <[email protected]> * Require parentheses in all function-like sub/superscripts (typst#6442) Co-authored-by: Laurenz <[email protected]> * Fix several wrong anchors in `$` docs link resolution (typst#6684) * Add `cargo testit` alias for running integration tests (typst#6682) Co-authored-by: Laurenz <[email protected]> * Update guides welcome text to refer to list instead of specific guides (typst#6685) Co-authored-by: Laurenz <[email protected]> * Prevent broken glyph assemblies when font data is incorrect (typst#6688) * Allow custom element names in HTML tag syntax (typst#6676) Co-authored-by: Laurenz <[email protected]> * Add interface to disable timer (typst#6695) Co-authored-by: Derived Cat <[email protected]> * Add support for drawing COLR glyphs in SVG export (typst#6693) * Apply aspect ratio correction for linear gradients in PDF export (typst#6689) * Wrap raw blocks in `<code>` tag additionally to `<pre>` tag (typst#6701) * Support for raw syntax highlighting in HTML export (typst#6691) * Ensure that whitespace is not collapsed in inline raw blocks (typst#6703) * Show aliases of citation styles in docs and completions (typst#6696) * Correct CeTZ spelling (typst#6706) * Add `title` element (typst#5618) Co-authored-by: Laurenz <[email protected]> * Make HTML data structures cheaper to clone (typst#6708) * Move `par`, `box`, and `block` to show rules in HTML export (typst#6709) * Support smartquotes in HTML export (typst#6710) Co-authored-by: Malo <[email protected]> * Avoid dangling reference output for HTML tests (typst#6711) * Support multiple fonts in math (typst#6365) * Add link to position field of grid.hline and grid.vline docs (typst#6670) * Rename `pdf.embed` to `pdf.attach` (typst#6705) * Include numbering in PDF bookmark (typst#6622) Co-authored-by: Laurenz <[email protected]> * Document escaping semicolon, valid identifiers, and `state` tips (typst#6674) Co-authored-by: Andrew Voynov <[email protected]> Co-authored-by: Yaksher <[email protected]> Co-authored-by: Laurenz <[email protected]> * Ensure table headers trigger rowbreak (typst#6687) * Fix phrasing of iff (if and only if) in docs (typst#6713) * Remove redundant "This can be" from stroke docs of curve and polygon (typst#6715) * Fix curve docs for fill (refer to curve instead of rectangle) (typst#6714) * Add span to `html.frame` node (typst#6716) * Fix return type of `missing_method` (typst#6718) * Encoding fixes for HTML raw text elements (typst#6720) * Update RelativeTo to include tiling in docs (typst#6730) * Add missing "the" for cmyk function of color docs (typst#6731) * Remove use of "last" and "end" for conic gradient circle docs (typst#6733) * Fix broken links in docs (typst#6734) * Simplify links in docs (typst#6732) Co-authored-by: Laurenz <[email protected]> * Bump hayro and krilla (typst#6741) * Deduplicate fallback smart quotes (typst#6747) * Move `is_inline` to `HtmlElem` (typst#6748) * Move grid cell locator creation to GridLayouter (typst#6746) * HTML whitespace protection (typst#6750) * Improve code snippets in Table Guide (typst#6658) * More accessible color scheme for raw blocks (typst#6754) Co-authored-by: Laurenz <[email protected]> * Use `stylistic-set: 1` in favor of `ss01` in docs and tests (typst#6766) * Implement fraction styles: vertical, skewed, and horizontal. (typst#6672) * Bump Rust to 1.89 in CI (typst#6775) Co-authored-by: Drodt <[email protected]> Co-authored-by: Daniel Drodt <[email protected]> * Fix typo in doc on quotes parameter of smartquote (typst#6779) * Fix logical order in bidirectional lines (typst#6796) * Extract `trim_weak_spacing` function (typst#6797) * Separate items for hyphens, fixing style of repeated hyphen (typst#6798) * Fix Unicode mapping of hyphenation artifacts (typst#6799) * Do not consider default ignorables when picking last resort font (typst#6805) * Compute width of shaped text on-demand (typst#6806) * Fix `sub` and `super` oneliners (typst#6791) * Ensure that hyphenation is possible after a tag (typst#6807) * Make links to `$grid` in `table` docs more specific (typst#6776) Co-authored-by: PgBiel <[email protected]> * Fix `repr` of `foo.with(..)` (typst#6773) * Fix case in docs serialization (typst#6808) * Add links and examples in the docs of `str` (typst#6751) Co-authored-by: Laurenz <[email protected]> * Hash page instead of frame for watch command (typst#6810) * Update nix flake and use nixfmt (typst#6827) * Update & fix tutorial part 3 & 4 example code (typst#6778) * Improve docs on customizing `raw` (typst#6000) Co-authored-by: Malo <[email protected]> Co-authored-by: Laurenz <[email protected]> * Better handle large numbers (u128/i128) in deserialization (typst#6836) * Follow the comment on setting the `State`'s mask (typst#6642) * Allow augment line at the beginning and end of a matrix (typst#5806) Co-authored-by: Laurenz <[email protected]> * Fix slicing last n elements using count (typst#6838) * Fix auto hanging-indent for centered headings (typst#6839) * Use rust-analyzer from fenix toolchain in flake (typst#6826) * Type safety for logical indices in line layout (typst#6848) * Load linked bitmap images in SVG images (typst#6794) Co-authored-by: Laurenz <[email protected]> * Fix CJ-Latin space at manual line breaks (typst#6700) Co-authored-by: Laurenz Mädje <[email protected]> * Allow multi-character symbols (typst#6489) Co-authored-by: Max <[email protected]> Co-authored-by: Laurenz <[email protected]> * Keep end of line whitespace glyphs (typst#6866) * Fix punctuation in HTML placeholder (typst#6854) * Unify and document the behaviours of `{json,yaml,toml,cbor}.encode` (typst#6743) Co-authored-by: Laurenz <[email protected]> * Improve docs of various numbering parameters (typst#6757) Co-authored-by: Laurenz <[email protected]> * Document and test `Sides<T>` parameters (typst#6862) Co-authored-by: Laurenz <[email protected]> * Remove unused `Styles::set_family` (typst#6879) * Make clear that `Content::query_first` is naive (typst#6880) * Ensure correct tag nesting with grouping rules (typst#6881) * Avoid breaking after an empty frame (typst#6335) * Add test for default ignorables before a breakpoint (typst#6782) * Fix typos (typst#6878) * Improve the docs on function params of `array.{sorted,dedup}` (typst#6756) * Add a link from `math.vec` to `math.{arrow,bold}` in docs (typst#6867) * Add a disclaimer about embedding PDFs (typst#6888) Co-authored-by: Laurenz <[email protected]> * Improve examples in the docs for under/over functions (typst#6889) * Improve docs of `Celled<T>` params of `table` and `grid` (typst#6764) Co-authored-by: Laurenz <[email protected]> * Fix off by one in tag expansion (typst#6900) * More useful `Debug` impls for `Tag` and `Location` (typst#6901) * Fix potential crash in `Debug` impl of `Property` (typst#6902) * Fix `Debug` impl for end tags (typst#6906) * Make `select_where!` usable outside of typst-library (typst#6910) * Fix footnote links in presence of styling (typst#6912) * Consistently ignore styles for tags (typst#6911) * Expand tags even a bit more around groupings (typst#6909) * Don't warn for zero-sized horizontal spacing in HTML export * Use `singleton!` for `HElem::hole` * Add way to attach role to closest element in HTML export * Add logical parent mechanism to HTML export * Generalize mechanism for root styles to HTML export * Support footnotes in HTML export * Add `default` argument to `array.join` (typst#6932) * Replace the non-existent `$math.arrow` with `$math.accent` in the docs for vector (typst#6918) * Initial Hayagriva bump (typst#6920) Co-authored-by: Laurenz <[email protected]> * Use different colors for object keys and string-based values in JSON listings (typst#6873) * Support for outline in HTML (typst#6606) * Use Title Case for Doc Pages (typst#6936) * Improve the docs for dictionary (typst#6899) * Add an illustration for `par.{leading,spacing}` in docs (typst#6915) Co-authored-by: Andrew Voynov <[email protected]> Co-authored-by: Laurenz <[email protected]> * Initial plan --------- Co-authored-by: Sam Ireson <[email protected]> Co-authored-by: PgBiel <[email protected]> Co-authored-by: Ian Wrzesinski <[email protected]> Co-authored-by: cAttte <[email protected]> Co-authored-by: Andrew Voynov <[email protected]> Co-authored-by: Laurenz <[email protected]> Co-authored-by: Tobias Schmitz <[email protected]> Co-authored-by: Max <[email protected]> Co-authored-by: 3w36zj6 <[email protected]> Co-authored-by: Malo <[email protected]> Co-authored-by: T0mstone <[email protected]> Co-authored-by: Lachlan Kermode <[email protected]> Co-authored-by: Y.D.X. <[email protected]> Co-authored-by: Ilia <[email protected]> Co-authored-by: Noam Zaks <[email protected]> Co-authored-by: Wannes Malfait <[email protected]> Co-authored-by: Ivica Nakić <[email protected]> Co-authored-by: +merlan #flirora <[email protected]> Co-authored-by: Connor K <[email protected]> Co-authored-by: Said A. <[email protected]> Co-authored-by: Florian Bohlken <[email protected]> Co-authored-by: Robin <[email protected]> Co-authored-by: Adrián Delgado <[email protected]> Co-authored-by: frozolotl <[email protected]> Co-authored-by: Jassiel Ovando <[email protected]> Co-authored-by: Patrick Massot <[email protected]> Co-authored-by: Erik <[email protected]> Co-authored-by: pog102 <[email protected]> Co-authored-by: Laurenz Stampfl <[email protected]> Co-authored-by: Niklas Eicker <[email protected]> Co-authored-by: Marcono1234 <[email protected]> Co-authored-by: Igor Khanin <[email protected]> Co-authored-by: hpcfzl <[email protected]> Co-authored-by: zefr0x <[email protected]> Co-authored-by: Abdul-Rahman Sibahi <[email protected]> Co-authored-by: 枚鴉 <[email protected]> Co-authored-by: Myriad-Dreamin <[email protected]> Co-authored-by: Derived Cat <[email protected]> Co-authored-by: Sebastian Eberle <[email protected]> Co-authored-by: Johann Birnick <[email protected]> Co-authored-by: Yaksher <[email protected]> Co-authored-by: Tau <[email protected]> Co-authored-by: Martin Haug <[email protected]> Co-authored-by: Théophile Cailliau <[email protected]> Co-authored-by: Drodt <[email protected]> Co-authored-by: Daniel Drodt <[email protected]> Co-authored-by: ultimatile <[email protected]> Co-authored-by: Poh <[email protected]> Co-authored-by: Clemens Koza <[email protected]> Co-authored-by: Siddhant Agarwal <[email protected]> Co-authored-by: Philipp Niedermayer <[email protected]> Co-authored-by: Toon Verstraelen <[email protected]> Co-authored-by: Eric Biedert <[email protected]> Co-authored-by: Jan Romann <[email protected]> Co-authored-by: copilot-swe-agent[bot] <[email protected]>

samuelireson added 2 commits March 31, 2025 15:23

initial refactor to use standard numbering fns

29e1d7f

tests passing

01d45e9

samuelireson marked this pull request as draft April 1, 2025 08:18

laurmaedje changed the title ~~numbering pattern implementation refactor~~ Numbering implementation refactor Apr 1, 2025

laurmaedje added the refactor A refactoring. label Apr 1, 2025

use 'n' and 'N' for romain 0

c3873b1

laurmaedje added the model Related to structure and semantics. label Apr 2, 2025

add comments for each numbering style

fb9f000

include higher greek terms to support more numbers.

laurmaedje added the waiting-on-author Pull request waits on author label Apr 7, 2025

tests passing

7336066

laurmaedje removed the waiting-on-author Pull request waits on author label Apr 11, 2025

samuelireson marked this pull request as ready for review April 11, 2025 13:00

laurmaedje reviewed Jun 3, 2025

View reviewed changes

crates/typst-library/src/model/numbering.rs Outdated Show resolved Hide resolved

deal with zero case in fixed scheme

29cc4a2

emilyyyylime reviewed Jun 4, 2025

View reviewed changes

samuelireson added 3 commits June 4, 2025 10:07

use slices

9e2419e

fix doc comments, use better 0 return in alphabetic

e86cdb4

include 15, 16 test case for hebrew

4427e85

remove higher weight hebrew numerals

a313654

laurmaedje added this pull request to the merge queue Jun 4, 2025

Merged via the queue into typst:main with commit 494e6a6 Jun 4, 2025
7 checks passed

laurmaedje mentioned this pull request Aug 7, 2025

Hebrew numbering shouldn't use geresh/gershayim #3332

Closed

1 task

Uh oh!

Conversation

samuelireson commented Mar 31, 2025

Uh oh!

samuelireson commented Mar 31, 2025

Uh oh!

laurmaedje commented Apr 1, 2025

Uh oh!

samuelireson commented Apr 1, 2025

Uh oh!

laurmaedje commented Apr 1, 2025

Uh oh!

LuxxxLucy commented Apr 1, 2025

Uh oh!

samuelireson commented Apr 2, 2025

Uh oh!

laurmaedje commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

samuelireson commented Apr 2, 2025

Uh oh!

LuxxxLucy commented Apr 2, 2025

Uh oh!

laurmaedje commented Apr 4, 2025

Uh oh!

samuelireson commented Apr 4, 2025

Uh oh!

laurmaedje commented Apr 4, 2025

Uh oh!

samuelireson commented Apr 11, 2025

Uh oh!

mohe2015 commented Apr 11, 2025

Uh oh!

samuelireson commented Apr 11, 2025

Uh oh!

mohe2015 commented Apr 11, 2025

Uh oh!

laurmaedje commented Apr 11, 2025

Uh oh!

samuelireson commented Apr 11, 2025

Uh oh!

laurmaedje commented Jun 3, 2025

Uh oh!

samuelireson commented Jun 3, 2025

Uh oh!

laurmaedje commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

laurmaedje commented Jun 3, 2025

Uh oh!

samuelireson commented Jun 3, 2025

Uh oh!

laurmaedje commented Jun 3, 2025

Uh oh!

samuelireson commented Jun 3, 2025

Uh oh!

samuelireson commented Jun 3, 2025

Uh oh!

Uh oh!

Uh oh!

emilyyyylime Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

samuelireson Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

samuelireson commented Jun 4, 2025

Uh oh!

laurmaedje commented Jun 4, 2025

Uh oh!

samuelireson commented Jun 4, 2025

Uh oh!

emilyyyylime commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Footnotes

Uh oh!

samuelireson commented Jun 4, 2025

Uh oh!

Andrew15-5 commented Jun 4, 2025

laurmaedje commented Apr 2, 2025 •

edited

Loading

laurmaedje commented Jun 3, 2025 •

edited

Loading

emilyyyylime commented Jun 4, 2025 •

edited

Loading