NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commitb2bbbfd

authored

Merge pull request#9481 from QuLogic/fix-hinting-factor

Apply hinting factor rcParam in all cases.

2 parents0084e4a +6a685d2 commitb2bbbfdCopy full SHA for b2bbbfd

File tree

5 files changed

+45

-6

lines changed

lib/matplotlib
- backends
  - backend_agg.py
- font_manager.py
- tests
  - test_font_manager.py
  - test_text.py
src
- ft2font.cpp

5 files changed

+45

-6

lines changed

`‎lib/matplotlib/backends/backend_agg.py`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -267,9 +267,7 @@ def _get_agg_font(self, prop):`
`267`	`267`	`Get the font for text instance t, cacheing for efficiency`
`268`	`268`	`"""`
`269`	`269`	`fname=findfont(prop)`
`270`		`-font=get_font(`
`271`		`-fname,`
`272`		`-hinting_factor=rcParams['text.hinting_factor'])`
	`270`	`+font=get_font(fname)`
`273`	`271`
`274`	`272`	`font.clear()`
`275`	`273`	`size=prop.get_size_in_points()`

`‎lib/matplotlib/font_manager.py`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1369,7 +1369,12 @@ def is_opentype_cff_font(filename):`
`1369`	`1369`	`_fmcache=None`
`1370`	`1370`
`1371`	`1371`
`1372`		`-get_font=lru_cache(64)(ft2font.FT2Font)`
	`1372`	`+_get_font=lru_cache(64)(ft2font.FT2Font)`
	`1373`	`+`
	`1374`	`+defget_font(filename,hinting_factor=None):`
	`1375`	`+ifhinting_factorisNone:`
	`1376`	`+hinting_factor=rcParams['text.hinting_factor']`
	`1377`	`+return_get_font(filename,hinting_factor)`
`1373`	`1378`
`1374`	`1379`
`1375`	`1380`	`# The experimental fontconfig-based backend.`

`‎lib/matplotlib/tests/test_font_manager.py`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`importtempfile`
`8`	`8`	`importwarnings`
`9`	`9`
	`10`	`+importnumpyasnp`
`10`	`11`	`importpytest`
`11`	`12`
`12`	`13`	`frommatplotlib.font_managerimport (`
`@@ -86,3 +87,22 @@ def test_otf():`
`86`	`87`	`@pytest.mark.skipif(nothas_fclist,reason='no fontconfig installed')`
`87`	`88`	`deftest_get_fontconfig_fonts():`
`88`	`89`	`assertlen(get_fontconfig_fonts())>1`
	`90`	`+`
	`91`	`+`
	`92`	`+@pytest.mark.parametrize('factor', [2,4,6,8])`
	`93`	`+deftest_hinting_factor(factor):`
	`94`	`+font=findfont(FontProperties(family=["sans-serif"]))`
	`95`	`+`
	`96`	`+font1=get_font(font,hinting_factor=1)`
	`97`	`+font1.clear()`
	`98`	`+font1.set_size(12,100)`
	`99`	`+font1.set_text('abc')`
	`100`	`+expected=font1.get_width_height()`
	`101`	`+`
	`102`	`+hinted_font=get_font(font,hinting_factor=factor)`
	`103`	`+hinted_font.clear()`
	`104`	`+hinted_font.set_size(12,100)`
	`105`	`+hinted_font.set_text('abc')`
	`106`	`+# Check that hinting only changes text layout by a small (10%) amount.`
	`107`	`+np.testing.assert_allclose(hinted_font.get_width_height(),expected,`
	`108`	`+rtol=0.1)`

`‎lib/matplotlib/tests/test_text.py`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`	`4`	`importsix`
	`5`	`+`
	`6`	`+importio`
`5`	`7`	`importwarnings`
`6`	`8`
`7`	`9`	`importnumpyasnp`
`@@ -448,3 +450,17 @@ def test_nonfinite_pos():`
`448`	`450`	`ax.text(0,np.nan,'nan')`
`449`	`451`	`ax.text(np.inf,0,'inf')`
`450`	`452`	`fig.canvas.draw()`
	`453`	`+`
	`454`	`+`
	`455`	`+deftest_hinting_factor_backends():`
	`456`	`+plt.rcParams['text.hinting_factor']=1`
	`457`	`+fig=plt.figure()`
	`458`	`+t=fig.text(0.5,0.5,'some text')`
	`459`	`+`
	`460`	`+fig.savefig(io.BytesIO(),format='svg')`
	`461`	`+expected=t.get_window_extent().intervalx`
	`462`	`+`
	`463`	`+fig.savefig(io.BytesIO(),format='png')`
	`464`	`+# Backends should apply hinting_factor consistently (within 10%).`
	`465`	`+np.testing.assert_allclose(t.get_window_extent().intervalx,expected,`
	`466`	`+rtol=0.1)`

`‎src/ft2font.cpp`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_) : image(), face(`
`515`	`515`	`face->face_flags \|= FT_FACE_FLAG_EXTERNAL_STREAM;`
`516`	`516`	`}`
`517`	`517`
`518`		`-staticFT_Matrix transform = {65536 / hinting_factor,0,0,65536 };`
	`518`	`+ FT_Matrix transform = {65536 / hinting_factor,0,0,65536 };`
`519`	`519`	`FT_Set_Transform(face, &transform,0);`
`520`	`520`	`}`
`521`	`521`
`@@ -548,7 +548,7 @@ void FT2Font::set_size(double ptsize, double dpi)`
`548`	`548`	`{`
`549`	`549`	`int error =FT_Set_Char_Size(`
`550`	`550`	`face, (long)(ptsize 64),0, (unsignedint)(dpi hinting_factor), (unsignedint)dpi);`
`551`		`-staticFT_Matrix transform = {65536 / hinting_factor,0,0,65536 };`
	`551`	`+ FT_Matrix transform = {65536 / hinting_factor,0,0,65536 };`
`552`	`552`	`FT_Set_Transform(face, &transform,0);`
`553`	`553`
`554`	`554`	`if (error) {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitb2bbbfd

File tree

5 files changed

5 files changed

`‎lib/matplotlib/backends/backend_agg.py`

`‎lib/matplotlib/font_manager.py`

`‎lib/matplotlib/tests/test_font_manager.py`

`‎lib/matplotlib/tests/test_text.py`

`‎src/ft2font.cpp`

0 commit comments