FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

ft2font: Read more entries from OS/2 font table by QuLogic · Pull Request #31226 · matplotlib/matplotlib · GitHub

  1. matplotlib
  2. matplotlib

Repository navigation

ft2font: Read more entries from OS/2 font table #31226

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

Merged
ksunden merged 1 commit into from
Mar 6, 2026
Conversation 0 Commits 1 Checks 34 Files changed
Merged

ft2font: Read more entries from OS/2 font table #31226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .cpp  (1) .py  (1) .pyi  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
13 changes: 9 additions & 4 deletions lib/matplotlib/ft2font.pyi
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,16 @@ class _SfntOs2Dict(TypedDict):
yStrikeoutPosition: int
sFamilyClass: int
panose: bytes
ulCharRange: tuple[int, int, int, int]
ulUnicodeRange: tuple[int, int, int, int]
achVendID: bytes
fsSelection: int
fsFirstCharIndex: int
fsLastCharIndex: int
usFirstCharIndex: int
usLastCharIndex: int
sTypoAscender: int
sTypoDescender: int
sTypoLineGap: int
usWinAscent: int
usWinDescent: int
# version >= 1
ulCodePageRange: NotRequired[tuple[int, int]]
# version >= 2
Expand Down Expand Up @@ -176,7 +181,7 @@ class _SfntVheaDict(TypedDict):
vertTypoLineGap: int
advanceHeightMax: int
minTopSideBearing: int
minBottomSizeBearing: int
minBottomSideBearing: int
yMaxExtent: int
caretSlopeRise: int
caretSlopeRun: int
Expand Down
18 changes: 12 additions & 6 deletions lib/matplotlib/tests/test_ft2font.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,11 @@ def test_ft2font_get_sfnt(font_name, expected):
'yStrikeoutSize': 102, 'yStrikeoutPosition': 530,
'sFamilyClass': 0,
'panose': b'\x02\x0b\x06\x03\x03\x08\x04\x02\x02\x04',
'ulCharRange': (3875565311, 3523280383, 170156073, 67117068),
'ulUnicodeRange': (3875565311, 3523280383, 170156073, 67117068),
'achVendID': b'PfEd',
'fsSelection': 64, 'fsFirstCharIndex': 32, 'fsLastCharIndex': 65535,
'fsSelection': 64, 'usFirstCharIndex': 32, 'usLastCharIndex': 65535,
'sTypoAscender': 1556, 'sTypoDescender': -492, 'sTypoLineGap': 410,
'usWinAscent': 1901, 'usWinDescent': 483,
'ulCodePageRange': (1610613247, 3758030848),
},
'hhea': {
Expand Down Expand Up @@ -654,9 +656,11 @@ def test_ft2font_get_sfnt(font_name, expected):
'yStrikeoutSize': 102, 'yStrikeoutPosition': 530,
'sFamilyClass': 0,
'panose': b'\x02\x0b\x05\x00\x00\x00\x00\x00\x00\x00',
'ulCharRange': (0, 0, 0, 0),
'ulUnicodeRange': (0, 0, 0, 0),
'achVendID': b'\x00\x00\x00\x00',
'fsSelection': 64, 'fsFirstCharIndex': 32, 'fsLastCharIndex': 9835,
'fsSelection': 64, 'usFirstCharIndex': 32, 'usLastCharIndex': 9835,
'sTypoAscender': 1276, 'sTypoDescender': -469, 'sTypoLineGap': 0,
'usWinAscent': 1430, 'usWinDescent': 477,
},
'hhea': {
'version': (1, 0),
Expand Down Expand Up @@ -734,9 +738,11 @@ def test_ft2font_get_sfnt(font_name, expected):
'yStrikeoutSize': 20, 'yStrikeoutPosition': 1037,
'sFamilyClass': 0,
'panose': b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
'ulCharRange': (3, 192, 0, 0),
'ulUnicodeRange': (3, 192, 0, 0),
'achVendID': b'STIX',
'fsSelection': 32, 'fsFirstCharIndex': 32, 'fsLastCharIndex': 10217,
'fsSelection': 32, 'usFirstCharIndex': 32, 'usLastCharIndex': 10217,
'sTypoAscender': 750, 'sTypoDescender': -250, 'sTypoLineGap': 1499,
'usWinAscent': 2095, 'usWinDescent': 404,
'ulCodePageRange': (2688417793, 2432565248),
'sxHeight': 0,
'sCapHeight': 0,
Expand Down
15 changes: 10 additions & 5 deletions src/ft2font_wrapper.cpp
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1282,12 +1282,17 @@ PyFT2Font_get_sfnt_table(PyFT2Font *self, std::string tagname)
"yStrikeoutPosition"_a=t->yStrikeoutPosition,
"sFamilyClass"_a=t->sFamilyClass,
"panose"_a=py::bytes(reinterpret_cast<const char *>(t->panose), 10),
"ulCharRange"_a=py::make_tuple(t->ulUnicodeRange1, t->ulUnicodeRange2,
t->ulUnicodeRange3, t->ulUnicodeRange4),
"ulUnicodeRange"_a=py::make_tuple(t->ulUnicodeRange1, t->ulUnicodeRange2,
t->ulUnicodeRange3, t->ulUnicodeRange4),
"achVendID"_a=py::bytes(reinterpret_cast<const char *>(t->achVendID), 4),
"fsSelection"_a=t->fsSelection,
"fsFirstCharIndex"_a=t->usFirstCharIndex,
"fsLastCharIndex"_a=t->usLastCharIndex);
"usFirstCharIndex"_a=t->usFirstCharIndex,
"usLastCharIndex"_a=t->usLastCharIndex,
"sTypoAscender"_a=t->sTypoAscender,
"sTypoDescender"_a=t->sTypoDescender,
"sTypoLineGap"_a=t->sTypoLineGap,
"usWinAscent"_a=t->usWinAscent,
"usWinDescent"_a=t->usWinDescent);
if (version >= 1) {
result["ulCodePageRange"] = py::make_tuple(t->ulCodePageRange1,
t->ulCodePageRange2);
Expand Down Expand Up @@ -1333,7 +1338,7 @@ PyFT2Font_get_sfnt_table(PyFT2Font *self, std::string tagname)
"vertTypoLineGap"_a=t->Line_Gap,
"advanceHeightMax"_a=t->advance_Height_Max,
"minTopSideBearing"_a=t->min_Top_Side_Bearing,
"minBottomSizeBearing"_a=t->min_Bottom_Side_Bearing,
"minBottomSideBearing"_a=t->min_Bottom_Side_Bearing,
"yMaxExtent"_a=t->yMax_Extent,
"caretSlopeRise"_a=t->caret_Slope_Rise,
"caretSlopeRun"_a=t->caret_Slope_Run,
Expand Down
Loading
Back | FazBrowse Home | New Git URL