Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix auto-sized glyphs with BaKoMa fonts#29936

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

Open
QuLogic wants to merge2 commits intomatplotlib:main
base:main
Choose a base branch
Loading
fromQuLogic:bakoma-sizes
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
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
90 changes: 35 additions & 55 deletionslib/matplotlib/_mathtext.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -470,60 +470,40 @@ def _get_glyph(self, fontname: str, font_class: str,
else:
return self._stix_fallback._get_glyph(fontname, font_class, sym)

# The Bakoma fonts contain many pre-sized alternatives for the
# delimiters. The AutoSizedChar class will use these alternatives
# and select the best (closest sized) glyph.
# The Bakoma fonts contain many pre-sized alternatives for the delimiters. The
# Auto(Height|Width)Char classes will use these alternatives and select the best
# (closest sized) glyph.
_latex_sizes = ('big', 'Big', 'bigg', 'Bigg')
Copy link
Contributor

Choose a reason for hiding this comment

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

minor typo two lines above, while you're at it: it's AutoHeightChar, not AutoSizedChar.

_size_alternatives = {
'(': [('rm', '('), ('ex', '\xa1'), ('ex', '\xb3'),
('ex', '\xb5'), ('ex', '\xc3')],
')': [('rm', ')'), ('ex', '\xa2'), ('ex', '\xb4'),
('ex', '\xb6'), ('ex', '\x21')],
'{': [('cal', '{'), ('ex', '\xa9'), ('ex', '\x6e'),
('ex', '\xbd'), ('ex', '\x28')],
'}': [('cal', '}'), ('ex', '\xaa'), ('ex', '\x6f'),
('ex', '\xbe'), ('ex', '\x29')],
# The fourth size of '[' is mysteriously missing from the BaKoMa
# font, so I've omitted it for both '[' and ']'
'[': [('rm', '['), ('ex', '\xa3'), ('ex', '\x68'),
('ex', '\x22')],
']': [('rm', ']'), ('ex', '\xa4'), ('ex', '\x69'),
('ex', '\x23')],
r'\lfloor': [('ex', '\xa5'), ('ex', '\x6a'),
('ex', '\xb9'), ('ex', '\x24')],
r'\rfloor': [('ex', '\xa6'), ('ex', '\x6b'),
('ex', '\xba'), ('ex', '\x25')],
r'\lceil': [('ex', '\xa7'), ('ex', '\x6c'),
('ex', '\xbb'), ('ex', '\x26')],
r'\rceil': [('ex', '\xa8'), ('ex', '\x6d'),
('ex', '\xbc'), ('ex', '\x27')],
r'\langle': [('ex', '\xad'), ('ex', '\x44'),
('ex', '\xbf'), ('ex', '\x2a')],
r'\rangle': [('ex', '\xae'), ('ex', '\x45'),
('ex', '\xc0'), ('ex', '\x2b')],
r'\__sqrt__': [('ex', '\x70'), ('ex', '\x71'),
('ex', '\x72'), ('ex', '\x73')],
r'\backslash': [('ex', '\xb2'), ('ex', '\x2f'),
('ex', '\xc2'), ('ex', '\x2d')],
r'/': [('rm', '/'), ('ex', '\xb1'), ('ex', '\x2e'),
('ex', '\xcb'), ('ex', '\x2c')],
r'\widehat': [('rm', '\x5e'), ('ex', '\x62'), ('ex', '\x63'),
('ex', '\x64')],
r'\widetilde': [('rm', '\x7e'), ('ex', '\x65'), ('ex', '\x66'),
('ex', '\x67')],
r'<': [('cal', 'h'), ('ex', 'D')],
r'>': [('cal', 'i'), ('ex', 'E')]
}
'(': [('rm', '('), *[('ex', fr'\__parenleft{s}__') for s in _latex_sizes]],
')': [('rm', ')'), *[('ex', fr'\__parenright{s}__') for s in _latex_sizes]],
'{': [('ex', fr'\__braceleft{s}__') for s in _latex_sizes],
'}': [('ex', fr'\__braceright{s}__') for s in _latex_sizes],
'[': [('rm', '['), *[('ex', fr'\__bracketleft{s}__') for s in _latex_sizes]],
']': [('rm', ']'), *[('ex', fr'\__bracketright{s}__') for s in _latex_sizes]],
'<': [('cal', r'\__angbracketleft__'),
*[('ex', fr'\__angbracketleft{s}__') for s in _latex_sizes]],
'>': [('cal', r'\__angbracketright__'),
*[('ex', fr'\__angbracketright{s}__') for s in _latex_sizes]],
r'\lfloor': [('ex', fr'\__floorleft{s}__') for s in _latex_sizes],
r'\rfloor': [('ex', fr'\__floorright{s}__') for s in _latex_sizes],
r'\lceil': [('ex', fr'\__ceilingleft{s}__') for s in _latex_sizes],
r'\rceil': [('ex', fr'\__ceilingright{s}__') for s in _latex_sizes],
r'\__sqrt__': [('ex', fr'\__radical{s}__') for s in _latex_sizes],
r'\backslash': [('ex', fr'\__backslash{s}__') for s in _latex_sizes],
r'/': [('rm', '/'), *[('ex', fr'\__slash{s}__') for s in _latex_sizes]],
r'\widehat': [('rm', '\x5e'), ('ex', r'\__hatwide__'), ('ex', r'\__hatwider__'),
('ex', r'\__hatwidest__')],
r'\widetilde': [('rm', '\x7e'), ('ex', r'\__tildewide__'),
('ex', r'\__tildewider__'), ('ex', r'\__tildewidest__')],
}

for alias, target in [(r'\leftparen', '('),
(r'\rightparen', ')'),
(r'\leftbrace', '{'),
(r'\rightbrace', '}'),
(r'\leftbracket', '['),
(r'\rightbracket', ']'),
(r'\{', '{'),
(r'\}', '}'),
(r'\[', '['),
(r'\]', ']')]:
for alias, target in [(r'\leftparen', '('), (r'\rightparen', ')'),
(r'\leftbrace', '{'), (r'\rightbrace', '}'),
(r'\leftbracket', '['), (r'\rightbracket', ']'),
(r'\langle', '<'), (r'\rangle', '>'),
(r'\{', '{'), (r'\}', '}'),
(r'\[', '['), (r'\]', ']')]:
_size_alternatives[alias] = _size_alternatives[target]

def get_sized_alternatives_for_symbol(self, fontname: str,
Expand DownExpand Up@@ -1524,7 +1504,7 @@ class AutoHeightChar(Hlist):
"""

def __init__(self, c: str, height: float, depth: float, state: ParserState,
always: bool = False,factor: float | None = None):
factor: float | None = None):
alternatives = state.fontset.get_sized_alternatives_for_symbol(
state.font, c)

Expand DownExpand Up@@ -1563,7 +1543,7 @@ class AutoWidthChar(Hlist):
always just return a scaled version of the glyph.
"""

def __init__(self, c: str, width: float, state: ParserState, always: bool = False,
def __init__(self, c: str, width: float, state: ParserState,
char_class: type[Char] = Char):
alternatives = state.fontset.get_sized_alternatives_for_symbol(
state.font, c)
Expand DownExpand Up@@ -2712,7 +2692,7 @@ def sqrt(self, toks: ParseResults) -> T.Any:
# the height so it doesn't seem cramped
height = body.height - body.shift_amount + thickness * 5.0
depth = body.depth + body.shift_amount
check = AutoHeightChar(r'\__sqrt__', height, depth, state, always=True)
check = AutoHeightChar(r'\__sqrt__', height, depth, state)
height = check.height - check.shift_amount
depth = check.depth + check.shift_amount

Expand Down
71 changes: 71 additions & 0 deletionslib/matplotlib/_mathtext_data.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,75 @@
'{' : ('cmex10', 0xa9),
'}' : ('cmex10', 0xaa),

'\\__angbracketleft__' : ('cmsy10', 0x68),
'\\__angbracketright__' : ('cmsy10', 0x69),
'\\__angbracketleftbig__' : ('cmex10', 0xad),
'\\__angbracketleftBig__' : ('cmex10', 0x44),
'\\__angbracketleftbigg__' : ('cmex10', 0xbf),
'\\__angbracketleftBigg__' : ('cmex10', 0x2a),
'\\__angbracketrightbig__' : ('cmex10', 0xae),
'\\__angbracketrightBig__' : ('cmex10', 0x45),
'\\__angbracketrightbigg__' : ('cmex10', 0xc0),
'\\__angbracketrightBigg__' : ('cmex10', 0x2b),
'\\__backslashbig__' : ('cmex10', 0xb2),
'\\__backslashBig__' : ('cmex10', 0x2f),
'\\__backslashbigg__' : ('cmex10', 0xc2),
'\\__backslashBigg__' : ('cmex10', 0x2d),
'\\__braceleftbig__' : ('cmex10', 0xa9),
'\\__braceleftBig__' : ('cmex10', 0x6e),
'\\__braceleftbigg__' : ('cmex10', 0xbd),
'\\__braceleftBigg__' : ('cmex10', 0x28),
'\\__bracerightbig__' : ('cmex10', 0xaa),
'\\__bracerightBig__' : ('cmex10', 0x6f),
'\\__bracerightbigg__' : ('cmex10', 0xbe),
'\\__bracerightBigg__' : ('cmex10', 0x29),
'\\__bracketleftbig__' : ('cmex10', 0xa3),
'\\__bracketleftBig__' : ('cmex10', 0x68),
'\\__bracketleftbigg__' : ('cmex10', 0x2219),
'\\__bracketleftBigg__' : ('cmex10', 0x22),
'\\__bracketrightbig__' : ('cmex10', 0xa4),
'\\__bracketrightBig__' : ('cmex10', 0x69),
'\\__bracketrightbigg__' : ('cmex10', 0xb8),
'\\__bracketrightBigg__' : ('cmex10', 0x23),
'\\__ceilingleftbig__' : ('cmex10', 0xa7),
'\\__ceilingleftBig__' : ('cmex10', 0x6c),
'\\__ceilingleftbigg__' : ('cmex10', 0xbb),
'\\__ceilingleftBigg__' : ('cmex10', 0x26),
'\\__ceilingrightbig__' : ('cmex10', 0xa8),
'\\__ceilingrightBig__' : ('cmex10', 0x6d),
'\\__ceilingrightbigg__' : ('cmex10', 0xbc),
'\\__ceilingrightBigg__' : ('cmex10', 0x27),
'\\__floorleftbig__' : ('cmex10', 0xa5),
'\\__floorleftBig__' : ('cmex10', 0x6a),
'\\__floorleftbigg__' : ('cmex10', 0xb9),
'\\__floorleftBigg__' : ('cmex10', 0x24),
'\\__floorrightbig__' : ('cmex10', 0xa6),
'\\__floorrightBig__' : ('cmex10', 0x6b),
'\\__floorrightbigg__' : ('cmex10', 0xba),
'\\__floorrightBigg__' : ('cmex10', 0x25),
'\\__hatwide__' : ('cmex10', 0x62),
'\\__hatwider__' : ('cmex10', 0x63),
'\\__hatwidest__' : ('cmex10', 0x64),
'\\__parenleftbig__' : ('cmex10', 0xa1),
'\\__parenleftBig__' : ('cmex10', 0xb3),
'\\__parenleftbigg__' : ('cmex10', 0xb5),
'\\__parenleftBigg__' : ('cmex10', 0xc3),
'\\__parenrightbig__' : ('cmex10', 0xa2),
'\\__parenrightBig__' : ('cmex10', 0xb4),
'\\__parenrightbigg__' : ('cmex10', 0xb6),
'\\__parenrightBigg__' : ('cmex10', 0x21),
'\\__radicalbig__' : ('cmex10', 0x70),
'\\__radicalBig__' : ('cmex10', 0x71),
'\\__radicalbigg__' : ('cmex10', 0x72),
'\\__radicalBigg__' : ('cmex10', 0x73),
'\\__slashbig__' : ('cmex10', 0xb1),
'\\__slashBig__' : ('cmex10', 0x2e),
'\\__slashbigg__' : ('cmex10', 0xc1),
'\\__slashBigg__' : ('cmex10', 0x2c),
'\\__tildewide__' : ('cmex10', 0x65),
'\\__tildewider__' : ('cmex10', 0x66),
'\\__tildewidest__' : ('cmex10', 0x67),

',' : ('cmmi10', 0x3b),
'.' : ('cmmi10', 0x3a),
'/' : ('cmmi10', 0x3d),
Expand DownExpand Up@@ -1109,6 +1178,8 @@
'|' : 0x2016,
'}' : 0x7d,
}
tex2uni['__angbracketleft__'] = tex2uni['langle']
tex2uni['__angbracketright__'] = tex2uni['rangle']

# Each element is a 4-tuple of the form:
# src_start, src_end, dst_font, dst_start
Expand Down
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Loading
Sorry, something went wrong.Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp