Simplify and tighten parse_fontconfig_pattern. #24220
Merged
Conversation
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
c6feb3f to
f11731a
Compare
oscargus
reviewed
Oct 19, 2022
| if "families" in parse: | ||
| props["family"] = [*map(_family_unescape, parse['families'])] | ||
| if "size" in parse: | ||
| props["size"] = parse["sizes"] |
There was a problem hiding this comment.
Typo? (At least I do not understand why checking for "size" is a requirement to get "sizes".)
b9ae235 to
e2ced43
Compare
oscargus
reviewed
Oct 20, 2022
| ``parse_fontconfig_pattern`` will no longer ignore unknown constant names | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| Previously, in a fontconfig pattern like ``DejaVu Sans:foo``, the | ||
| unknown ``foo`` constant name would be silently ignored. This is now raises |
There was a problem hiding this comment.
Suggested change
| unknown ``foo`` constant name would be silently ignored. This is now raises | |
| unknown ``foo`` constant name would be silently ignored. This now raises |
6961e32 to
cf9ebeb
Compare
QuLogic
reviewed
Oct 21, 2022
QuLogic
approved these changes
Oct 21, 2022
|
I further tweaked the parser a bit for conciseness. |
- Warn on unknown constant names, e.g. ``DejaVu Sans:unknown`` (as opposed e.g. to ``DejaVu Sans:bold``); they were previously silently ignored. - Rewrite the parser into something much simpler, moving nearly all the logic into a single block post-processing the result of parseString, instead of splitting everything into many small parse actions. In particular this makes the parser mostly stateless (except for the cache held by pyparsing itself), instead of having the various parts communicate through the _properties attribute.
ksunden
approved these changes
Oct 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Warn on unknown constant names, e.g.
DejaVu Sans:unknown(as opposed e.g. toDejaVu Sans:bold); they were previously silently ignored.Rewrite the parser into something much simpler, moving nearly all the logic into a single block post-processing the result of parseString, instead of splitting everything into many small parse actions. In particular this makes the parser mostly stateless (except for the cache held by pyparsing itself), instead of having the various parts communicate through the _properties attribute.
PR Summary
PR Checklist
Tests and Styling
pytestpasses).flake8-docstringsand runflake8 --docstring-convention=all).Documentation
doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).