Skip to content
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

Consistent multiline spacing and tests, with extra space #1574

Merged

Conversation

hugovk
Copy link
Member

@hugovk hugovk commented Dec 6, 2015

This fixes the inconsistent multiline spacing reported in #1540.

It includes the fix from @wiredfool and I updated the tests. I checked the baseline-to-baseline heights in the new images and they're equal.

In PR #1573 I noticed the lines are a bit close together by default. So I set the spacing to four pixels by default instead of zero.


Here's the PR without extra spacing by default, and so either that or this should be merged, not both.

@hugovk
Copy link
Member Author

hugovk commented Dec 6, 2015

Coverage decreased because the changes in _imagingft.c to add getters for x_ppem, y_ppem and height aren't actually used in the fix, and were just for investigation. Shall we just remove them?

@wiredfool
Copy link
Member

I'd say keep the getters. It's not private information.

wiredfool added a commit that referenced this pull request Dec 7, 2015
Consistent multiline spacing and tests, with extra space
@wiredfool wiredfool merged commit 2f75ee7 into python-pillow:master Dec 7, 2015
@hugovk hugovk deleted the wiredfool-multiline_text-plus4 branch December 7, 2015 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants