-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Update to score_family in font_manager.py #4689
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1099,15 +1099,18 @@ def score_family(self, families, family2): | |
Returns a match score between the list of font families in | ||
*families* and the font family name *family2*. | ||
|
||
An exact match anywhere in the list returns 0.0. | ||
An exact match at the head of the list returns 0.0. | ||
|
||
A match by generic font name will return 0.1. | ||
A match further down the list will return between 0 and 1. | ||
|
||
No match will return 1.0. | ||
""" | ||
if not isinstance(families, (list, tuple)): | ||
families = [families] | ||
elif len(families) == 0: | ||
return 1.0 | ||
family2 = family2.lower() | ||
step = 1 / len(families) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we need a special case here for There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In which case, it should just return 1 immediately. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Agreed, although it never checked before. Not a bad idea tho to be safe. |
||
for i, family1 in enumerate(families): | ||
family1 = family1.lower() | ||
if family1 in font_family_aliases: | ||
|
@@ -1117,12 +1120,11 @@ def score_family(self, families, family2): | |
options = [x.lower() for x in options] | ||
if family2 in options: | ||
idx = options.index(family2) | ||
return ((0.1 * (idx / len(options))) * | ||
((i + 1) / len(families))) | ||
return (i + (idx / len(options))) * step | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A match for an alias should never be higher than an exact match. Yet here, if i == 0, the return value is 0. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is where I get confused, and either don't understand or don't agree with the scoring algorithm. If it matches an alias, and that alias was provided first in the font families list, and the specific font being scored appears first in the alias list, wouldn't that score a 0? How could there be a better match? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also, part of the current bug this PR attempts to fix is that an alias match will return 0 if the font is first in the alias list, regardless of where that alias appears in the font families list. |
||
elif family1 == family2: | ||
# The score should be weighted by where in the | ||
# list the font was found. | ||
return i / len(families) | ||
return i * step | ||
return 1.0 | ||
|
||
def score_style(self, style1, style2): | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now checking for empty families list here. The unchecked division by len(families) used to be inside the loop, where it was not reachable if len(families) == 0. Thanks for catching that!