Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork8.1k
Drop the FT2Font intermediate buffer.#30059
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
base:text-overhaul
Are you sure you want to change the base?
Uh oh!
There was an error while loading.Please reload this page.
Conversation
story645 commentedMay 16, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
Would you be open to using a tracking issue or project board for the font work (sample categories: draft, waiting on other PRs, ready for review, please review first)? I think breaking everything up into small PRs is fantastic but I'm finding it a bit overwhelming to keep track of the order for reviewing things (and figure I'm not alone here) and how these PRs relate to each other. |
anntzer commentedMay 16, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
Sure, I'll do that. I'm sorry for the mess, but this is basically me trying to remember all the patches or even just ideas I have accumulated over the years that went nowhere because they would thrash all the baseline images, and that I now try to present given that I see an opportunity with the FreeType upgrade. Also, some of them are notfully complete patches but things that I believe can be made complete with relatively little effort (for some value of "little effort"...) simply because I do not have the time now to finalize them but want to put them up for discussion as the underlying idea should be clear. |
story645 commentedMay 16, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
No apologies needed, I commend you for taking advantage of the freetype upgrade. And thanks for the wiki, though some reason can't link cleanly |
link fixed |
d44360f
to66fdae0
CompareEdit: fraction bar rendering has been added too. |
A few warnings from compiling locally:
|
This is semi-intentional: if these checks fail (error > 0) then the error should really be raised using throw_ft_error, not with a plain raise as I currently do, but throw_ft_error is not visible from ft2font_wrapper.cpp so some code needs to be moved around, e.g. make throw_ft_error an inline function defined in ft2font.h, or move the new implementations into real C++ FT2Font methods in ft2font.cpp and add wrapper lambdas in ft2font_wrapper.cpp, or (would be my preferred choice) switch error checking to the FT_CHECK macro used in mplcairo (see mplcairo's macros.h). |
On a side note, I'm in favour of this in general as removing the intermediate buffer will make emoji/colour glyphs easier since they won't need to go through it. |
On the call, we were discussing whether it made sense to target all these font-related (and requiring full image rebuild) PRs to a separate feature branch, which would contain the final test image updates. Do you have any thoughts on retargetting this PR (instead of folding it in to#29816)? |
anntzer commentedMay 30, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
Sure, I don't really mind either way? Should the branch live on this repo and be ultimately pruned out, or on yours? |
Fixed#30059 (comment) by using FT_CHECK (thus also needs#30123). |
anntzer commentedJun 10, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
I didn't look carefully but I believe I can just get rid of the changes in#29199 when rebasing because my PR essentially already does the same thing, correct? (no problem with doing the rebase, of course) |
I think so; it just fixes rotation, which you should be doing already. |
anntzer commentedJun 11, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
Actually, brutally rebasing on top of#29199 and rerunning the new test_rotation_mode_anchor suggests that there may be slight off-by-1 or so errors in positioning with the new code (nothing huge like what#29199 fixed, but still some slight asymmetry remaining between the rotated text strings). To be investigated... |
Yes, I did see that, but wasn't too sure it was wrong or not. Please rebase on the |
I convinced myself that the shift is not obviously wrong (that test uses center_baseline alignment; with e.g. baseline alignment I don't see such a shift) so I went ahead and gen'd the baseline images. Unrelatedly, I noticed that a large number of baseline image changes e.g. in test_axes could have been avoided if they used remove_text=True (it's ticklabels on tests that have nothing to do with ticklabels); perhaps many of them could get that option set? |
If you can put together a list, then please open a PR; I did similar for, e.g., layout tests:#29872 |
parse=self.mathtext_parser.parse( | ||
s,self.dpi,prop,antialiased=gc.get_antialiased()) | ||
c=cos(radians(angle)) | ||
s=sin(radians(angle)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
There's already ans
as input to the function, so this could be a bit confusing (also type checking probably wouldn't like it.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Fixed.
Uh oh!
There was an error while loading.Please reload this page.
BTW, not sure how you're updating the images, but I tend to start with the images fromthe |
I think the following tests can have their text removed fairly uncontroversially (so there's actually not so many of them):
(putting the list here but I won't work on the PR at least for now)
I got a bit confused on how to do that (I cherry-picked text-overhaul-figures tip then committed the extra differences, but then trying to rebase out the cherry-picked commit results in conflicts when trying to apply the extra commit. |
What you have to do is checkout the updated images, triage the new images in, reset and add the new ones. Something like this:
I haven't fully reviewed the patch, but I did rebase it for conflicts, so please verify that wasn't messed up. I uploaded the images as well, assuming I haven't messed that up. |
anntzer commentedSep 25, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
I checked the rebase, it looks good to me (thanks for doing it). One last thing missing from this is a proper antialiasing toggle (_render_glyph should take a Edit: antialiasing control has been implemented. |
Directly render FT glyphs to the Agg buffer. In particular, thisnaturally provides, with no extra work, subpixel positioning of glyphs(which could also have been implemented in the old framework, but wouldhave required careful tracking of subpixel offets).Note that all baseline images should be regenerated. The new APIs addedto FT2Font are also up to bikeshedding (but they are all private).
Uh oh!
There was an error while loading.Please reload this page.
Directly render FT glyphs to the Agg buffer. In particular, this naturally provides, with no extra work, subpixel positioning of glyphs (closing#29551) (this could also have been implemented in the old framework, but would have required careful tracking of subpixel offets).
Note that rendering of mathtext boxes (e.g., fraction bars) is currently missing, but should be "easy" (the main question being whether/how to ensure proper hinting/alignment to pixel edges in the horizontal or vertical output cases).Likewise, all baseline images should be regenerated. Finally, the new APIs added to FT2Font are likely up to bikeshedding (but they are all private).In practice this should get included (if we agree to go this way) into the FreeType update (#29816). This would also supersede the patch advertised at#29816 (comment).
test modified from#29551 to also include mathtext:
PR summary
PR checklist