8000 Improve font weight guessing by Rufflewind · Pull Request #8551 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Improve font weight guessing #8551

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

Closed
wants to merge 3 commits into from
Closed

Improve font weight guessing #8551

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
425e0d2
Recognize more font weights and update mapping
Rufflewind Apr 29, 2017
fac41c8
Improve font weight guesser
Rufflewind Apr 29, 2017
96a47ef
Restore original numeric weights
Rufflewind May 1, 2017
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
17 changes: 14 additions & 3 deletions lib/matplotlib/font_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,25 @@
'ultra-expanded' : 900}

weight_dict = {
'hair' : 50,
'thin' : 50,
'extralight' : 100,
'ultralight' : 100,
'light' : 200,
'normal' : 400,
'regular' : 400,
'book' : 400,
'plain' : 400,
'medium' : 500,
'roman' : 500,
'semibold' : 600,
'demibold' : 600,
'demi' : 600,
'bold' : 700,
'heavy' : 800,
'extrabold' : 800,
'extra bold' : 800,
'ultrabold' : 800,
'black' : 900}

font_family_aliases = {
Expand Down Expand Up @@ -402,6 +408,7 @@ def ttfFontProperty(font):
*font* is a :class:`FT2Font` instance.
"""
name = font.family_name
style_name = font.style_name.lower().strip()

# Styles are: italic, oblique, and normal (default)

Expand Down Expand Up @@ -437,10 +444,14 @@ def ttfFontProperty(font):

weight = next((w for w in weight_dict if sfnt4.find(w) >= 0), None)
if not weight:
if font.style_flags & ft2font.BOLD:
weight = 700
else:
weight = next((w for w in weight_dict if style_name.find(w) >= 0), None)
if weight:
pass
elif style_name in ["italic", "oblique", "condensed"]:
weight = 400
else:
# give up rather than risk making mistakes (reason: #8550)
raise KeyError("unknown weight: {!r}".format(font.family_name))

# Stretch can be absolute and relative
# Absolute stretches are: ultra-condensed, extra-condensed, condensed,
Expand Down
0