Add support for numeric font weight
#6990
improve font family checks
- Loading branch information
commit bff00ac8d60f0b154aaec75615621e63cb89c2f1
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -396,14 +396,14 @@ function getTextFont(trace) { | |
| else if(weight > 250) str += ' Light'; | ||
| else if(weight > 150) str += ' Extra Light'; | ||
| else str += ' Thin'; | ||
| } else if(parts.slice(0, 2).join(' ') === 'Open Sans') { | ||
| str = 'Open Sans'; | ||
| if(weight > 750) str += ' Extrabold'; | ||
| else if(weight > 650) str += ' Bold'; | ||
| else if(weight > 550) str += ' Semibold'; | ||
| else if(weight > 350) str += ' Regular'; | ||
| else str += ' Light'; | ||
| } else if(parts.slice(0, 3).join(' ') === 'Klokantech Noto Sans') { | ||
| str = 'Klokantech Noto Sans'; | ||
|
There was a problem hiding this comment. Doesn't this There was a problem hiding this comment. oh I see, maybe not, because it has already passed through the There was a problem hiding this comment. Good point. No that shouldn't happen because further down we test and ensure the font is supported. There was a problem hiding this comment. Addressed in bff00ac. |
||
| if(parts[3] === 'CJK') str += ' CJK'; | ||
| str += (weight > 500) ? ' Bold' : ' Regular'; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
nit: Couldn't this be
family.startsWith('Open Sans')?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.
Sure. That may break IE11 which is fine as of today :)