Skip to content

Solve the issue that some fonts are not handled correctly #8607

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
cy18 wants to merge 3 commits into from
Closed

Solve the issue that some fonts are not handled correctly #8607

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efccd64
Improve the method of judging weight
cy18 May 11, 2017
cc95a98
Added thin and demilight as font weight
cy18 May 11, 2017
46c20e2
Try get font information from Platform 3(Windows Unicode) if no infor…
cy18 May 11, 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
13 changes: 12 additions & 1 deletion lib/matplotlib/font_manager.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@
weight_dict = {
'ultralight' : 100,
'light' : 200,
'thin' : 200,
'demilight' : 300,
'normal' : 400,
'regular' : 400,
'book' : 400,
Expand Down Expand Up @@ -407,13 +409,20 @@ def ttfFontProperty(font):

sfnt = font.get_sfnt()
sfnt2 = sfnt.get((1,0,0,2))
sfnt2_3 = sfnt.get((3,1,1033,2))
sfnt4 = sfnt.get((1,0,0,4))
sfnt4_3 = sfnt.get((3,1,1033,4))
if sfnt2:
sfnt2 = sfnt2.decode('macroman').lower()
elif sfnt2_3:
sfnt2 = sfnt2_3.decode('utf_16_be').lower()
else:
sfnt2 = ''

if sfnt4:
sfnt4 = sfnt4.decode('macroman').lower()
elif sfnt4_3:
sfnt4 = sfnt4_3.decode('utf_16_be').lower()
else:
sfnt4 = ''
if sfnt4.find('oblique') >= 0:
Expand All @@ -435,7 +444,9 @@ def ttfFontProperty(font):
else:
variant = 'normal'

weight = next((w for w in weight_dict if sfnt4.find(w) >= 0), None)
sorted_weights = sorted(weight_dict.keys(), key=lambda k: len(k),
reverse=True)
weight = next((w for w in sorted_weights if sfnt4.find(w) >= 0), None)
if not weight:
if font.style_flags & ft2font.BOLD:
weight = 700
Expand Down