Skip to content

Fix spacing in r"$\max f$". #30715

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuLogic merged 2 commits into from
Nov 6, 2025
Merged

Fix spacing in r"$\max f$". #30715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a99a83
Fix spacing in `r"$\max f$"`.
anntzer Nov 1, 2025
17428e3
Tweak sub/superscript spacing implementation.
anntzer Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions lib/matplotlib/_mathtext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2132,7 +2132,7 @@ def csnames(group: str, names: Iterable[str]) -> Regex:
self._math_expression = p.math

# To add space to nucleus operators after sub/superscripts
self._in_subscript_or_superscript = False
self._needs_space_after_subsuper = False

def parse(self, s: str, fonts_object: Fonts, fontsize: float, dpi: float) -> Hlist:
"""
Expand All @@ -2150,7 +2150,7 @@ def parse(self, s: str, fonts_object: Fonts, fontsize: float, dpi: float) -> Hli
# explain becomes a plain method on pyparsing 3 (err.explain(0)).
raise ValueError("\n" + ParseException.explain(err, 0)) from None
self._state_stack = []
self._in_subscript_or_superscript = False
self._needs_space_after_subsuper = False
# prevent operator spacing from leaking into a new expression
self._em_width_cache = {}
ParserElement.reset_cache()
Expand Down Expand Up @@ -2260,7 +2260,7 @@ def symbol(self, s: str, loc: int,
prev_char = next((c for c in s[:loc][::-1] if c != ' '), '')
# Binary operators at start of string should not be spaced
# Also, operators in sub- or superscripts should not be spaced
if (self._in_subscript_or_superscript or (
if (self._needs_space_after_subsuper or (
c in self._binary_operators and (
len(s[:loc].split()) == 0 or prev_char in {
'{', *self._left_delims, *self._relation_symbols}))):
Expand Down Expand Up @@ -2362,18 +2362,13 @@ def operatorname(self, s: str, loc: int, toks: ParseResults) -> T.Any:
next_char_loc += len('operatorname{}')
next_char = next((c for c in s[next_char_loc:] if c != ' '), '')
delimiters = self._delims | {'^', '_'}
if (next_char not in delimiters and
name not in self._overunder_functions):
if next_char not in delimiters:
# Add thin space except when followed by parenthesis, bracket, etc.
hlist_list += [self._make_space(self._space_widths[r'\,'])]
self.pop_state()
# if followed by a super/subscript, set flag to true
# This flag tells subsuper to add space after this operator
if next_char in {'^', '_'}:
self._in_subscript_or_superscript = True
else:
self._in_subscript_or_superscript = False

# If followed by a sub/superscript, set flag to true to tell subsuper
# to add space after this operator.
self._needs_space_after_subsuper = next_char in {'^', '_'}
return Hlist(hlist_list)

def start_group(self, toks: ParseResults) -> T.Any:
Expand Down Expand Up @@ -2483,7 +2478,10 @@ def subsuper(self, s: str, loc: int, toks: ParseResults) -> T.Any:
shift = hlist.height + vgap + nucleus.depth
vlt = Vlist(vlist)
vlt.shift_amount = shift
result = Hlist([vlt])
optional_spacing = ([self._make_space(self._space_widths[r'\,'])]
if self._needs_space_after_subsuper else [])
self._needs_space_after_subsuper = False
result = Hlist([vlt, *optional_spacing])
return [result]

# We remove kerning on the last character for consistency (otherwise
Expand Down Expand Up @@ -2575,12 +2573,10 @@ def subsuper(self, s: str, loc: int, toks: ParseResults) -> T.Any:

# Do we need to add a space after the nucleus?
# To find out, check the flag set by operatorname
spaced_nucleus: list[Node] = [nucleus, x]
if self._in_subscript_or_superscript:
spaced_nucleus += [self._make_space(self._space_widths[r'\,'])]
self._in_subscript_or_superscript = False

result = Hlist(spaced_nucleus)
optional_spacing = ([self._make_space(self._space_widths[r'\,'])]
if self._needs_space_after_subsuper else [])
self._needs_space_after_subsuper = False
result = Hlist([nucleus, x, *optional_spacing])
return [result]

def _genfrac(self, ldelim: str, rdelim: str, rule: float | None, style: _MathStyle,
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/tests/test_mathtext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ def test_operator_space(fig_test, fig_ref):
fig_test.text(0.1, 0.6, r"$\operatorname{op}[6]$")
fig_test.text(0.1, 0.7, r"$\cos^2$")
fig_test.text(0.1, 0.8, r"$\log_2$")
fig_test.text(0.1, 0.9, r"$\sin^2 \cos$") # GitHub issue #17852
fig_test.text(0.1, 0.9, r"$\sin^2 \max \cos$") # GitHub issue #17852

fig_ref.text(0.1, 0.1, r"$\mathrm{log\,}6$")
fig_ref.text(0.1, 0.2, r"$\mathrm{log}(6)$")
Expand All @@ -410,7 +410,7 @@ def test_operator_space(fig_test, fig_ref):
fig_ref.text(0.1, 0.6, r"$\mathrm{op}[6]$")
fig_ref.text(0.1, 0.7, r"$\mathrm{cos}^2$")
fig_ref.text(0.1, 0.8, r"$\mathrm{log}_2$")
fig_ref.text(0.1, 0.9, r"$\mathrm{sin}^2 \mathrm{\,cos}$")
fig_ref.text(0.1, 0.9, r"$\mathrm{sin}^2 \mathrm{\,max} \mathrm{\,cos}$")


@check_figures_equal()
Expand Down
Loading