Skip to content

Conversation

@anntzer
Copy link
Contributor

@anntzer anntzer commented Nov 1, 2025

First commit (main implementation):

Previously, in a mathtext string like r"$\sin x$", a thin space would
(correctly) be added between "sin" and "x", but that space would be
missing in expressions like r"$\max f$". The difference arose because
of the slightly different handling of subscripts and superscripts
after the \sin and \max operators: \sin^n puts the superscript as
a normal exponent, but \max_x puts the subscript centered below the
operator name ("overunder symbol). The previous code for inserting the
thin space did not handle the "overunder" case; fix that. The new
behavior is tested by the change in test_operator_space, as well as by
mathtext1_dejavusans_06.

The change in mathtext_foo_29 arises because the extra thin space now
inserted after \limsup slightly shifts the centering of the whole
string. Ideally that thin space should be suppressed if there's no
token after the operator, but that's not something currently implemented
either for e.g. \sin (compare e.g. the right-alignments in
text(.5, .9, r"$\sin$", ha="right"); text(.5, .8, r"$\mathrm{sin}$", ha="right"); axvline(.5)
where the extra thin space after \sin is visible), so this patch just
makes things more consistent.

Second commit (cleanup):

Rename _in_subscript_or_superscript to the more descriptive
_needs_space_after_subsuper; simplify its setting in operatorname();
avoid the need to introduce an extra explicitly-typed spaced_nucleus
variable.

(See previous work in #17890 and #23243.)
@QuLogic This PR also changes a few baseline images so maybe it could get folded into the text-overhaul branch (for now I labeled it as such), but the changes are limited and standalone so it could also go in as a normal PR if that makes things simpler for you, I don't mind either way.

PR summary

PR checklist

@anntzer anntzer added this to the v3.11.0 milestone Nov 1, 2025
Copy link
Member

@timhoffm timhoffm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, still some tests are failing.

Comment on lines 2496 to 2502
result = Hlist([
vlt,
*([self._make_space(self._space_widths[r'\,'])]
if self._needs_space_after_subsuper else []),
])
self._needs_space_after_subsuper = False
return [result]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional alternative spelling. Choose whichever you like.

Suggested change
result = Hlist([
vlt,
*([self._make_space(self._space_widths[r'\,'])]
if self._needs_space_after_subsuper else []),
])
self._needs_space_after_subsuper = False
return [result]
spacing_nodes = (
[self._make_space(self._space_widths[r'\,'])]
if self._needs_space_after_subsuper else []
)
self._needs_space_after_subsuper = False
return [Hlist([vlt, *spacing_nodes])]

Copy link
Member

@oscargus oscargus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly update *_29 to include a text after? f(x)? To establish that there should be a space etc.

@anntzer anntzer changed the base branch from text-overhaul to main November 2, 2025 21:16
@anntzer
Copy link
Contributor Author

anntzer commented Nov 2, 2025

Testing for the space is already provided by mathtext1_dejavusans_06 (after the max).
I'm a bit confused as to why the tests are failing given that they fail for some of the baselines that had been updated just for this purpose. Maybe resetting the target branch to main instead of text-overhaul will help? Let's try... Edit: indeed, that worked.
Also included a variant of @timhoffm's proposed change.

Copy link
Member

@timhoffm timhoffm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll leave this open, so that you can decide yourself on which branch this should go.

@anntzer
Copy link
Contributor Author

anntzer commented Nov 3, 2025

Mostly that's a decision for @QuLogic, I'd say.

Previously, in a mathtext string like `r"$\sin x$"`, a thin space would
(correctly) be added between "sin" and "x", but that space would be
missing in expressions like `r"$\max f$"`.  The difference arose because
of the slightly different handling of subscripts and superscripts
after the `\sin` and `\max` operators: `\sin^n` puts the superscript as
a normal exponent, but `\max_x` puts the subscript centered below the
operator name ("overunder symbol).  The previous code for inserting the
thin space did not handle the "overunder" case; fix that.  The new
behavior is tested by the change in test_operator_space, as well as by
mathtext1_dejavusans_06.

The change in mathtext_foo_29 arises because the extra thin space now
inserted after `\limsup` slightly shifts the centering of the whole
string.  Ideally that thin space should be suppressed if there's no
token after the operator, but that's not something currently implemented
either for e.g. `\sin` (compare e.g. the right-alignments in
`text(.5, .9, r"$\sin$", ha="right"); text(.5, .8, r"$\mathrm{sin}$", ha="right"); axvline(.5)`
where the extra thin space after `\sin` is visible), so this patch just
makes things more consistent.
Rename _in_subscript_or_superscript to the more descriptive
_needs_space_after_subsuper; simplify its setting in operatorname();
avoid the need to introduce an extra explicitly-typed spaced_nucleus
variable.
@QuLogic
Copy link
Member

QuLogic commented Nov 6, 2025

There shouldn't be any reason why it can't go on the text-overhaul branch...

@QuLogic QuLogic changed the base branch from main to text-overhaul November 6, 2025 10:29
@QuLogic QuLogic force-pushed the opspace branch 2 times, most recently from 905fd51 to 17428e3 Compare November 6, 2025 17:26
@QuLogic QuLogic merged commit e952f23 into matplotlib:text-overhaul Nov 6, 2025
30 of 31 checks passed
@anntzer anntzer deleted the opspace branch November 6, 2025 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants