-
Notifications
You must be signed in to change notification settings - Fork 24
Ignore COMMENTS when parsing for FONTBOUNDINGBOX #56
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
Ignore COMMENTS when parsing for FONTBOUNDINGBOX #56
Conversation
Can you share the font that you discovered this issue with? I have not run across one with this many comment lines that causes the problem. I could artificially add some, but it would be great to have a "naturally occurring" font file to test the fix with. |
Sure thing! Here it is as a link (I guess I can't attach BDF files): Basically, the license is present as a huge comment block. I moved the license to it's own file to fix it, but here's the original. |
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.
LGTM Thanks @tekktrik
Tested successfully on PyPortal 7.2.0-alpha.1 with custom font label using the supplied BDF with many comment lines.
Updating https://github.com/adafruit/Adafruit_CircuitPython_24LC32 to 1.0.1 from 1.0.0: > Merge pull request adafruit/Adafruit_CircuitPython_24LC32#11 from tekktrik/doc/add-typing > Merge pull request adafruit/Adafruit_CircuitPython_24LC32#12 from tekktrik/hotfix/patch-cleanup-fix Updating https://github.com/adafruit/Adafruit_CircuitPython_ADS1x15 to 2.2.11 from 2.2.10: > First part of patch > Merge pull request adafruit/Adafruit_CircuitPython_ADS1x15#77 from nlantau/patch-1 > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_BNO055 to 5.3.3 from 5.3.2: > Merge pull request adafruit/Adafruit_CircuitPython_BNO055#90 from adafruit/patch-fix > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_CCS811 to 1.3.6 from 1.3.5: > Merge pull request adafruit/Adafruit_CircuitPython_CCS811#47 from sti320a/patch-1 > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_CLUE to 3.0.2 from 3.0.1: > Merge pull request adafruit/Adafruit_CircuitPython_CLUE#54 from kevinjwalters/sample-fix > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI to 4.0.0 from 3.6.0: > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#146 from tekktrik/fix/rename-pin-args > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#155 from tekktrik/hotfix/fix-recv-into > First part of patch Updating https://github.com/adafruit/Adafruit_CircuitPython_SCD4X to 1.2.2 from 1.2.1: > Merge pull request adafruit/Adafruit_CircuitPython_SCD4X#12 from KeithTheEE/get-data-ready-status-fix > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_STMPE610 to 1.3.0 from 1.2.7: > Merge pull request adafruit/Adafruit_CircuitPython_STMPE610#22 from CedarGroveStudios/main > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_Thermistor to 3.4.0 from 3.3.8: > Merge pull request adafruit/Adafruit_CircuitPython_Thermistor#19 from raquo/main > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font to 1.5.5 from 1.5.4: > Merge pull request adafruit/Adafruit_CircuitPython_Bitmap_Font#56 from tekktrik/feature/ignore-comments-parsing > First part of patch Updating https://github.com/adafruit/Adafruit_CircuitPython_Debouncer to 1.4.0 from 1.3.13: > Merge pull request adafruit/Adafruit_CircuitPython_Debouncer#34 from prplz/main > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_Display_Button to 1.6.2 from 1.6.1: > Merge pull request adafruit/Adafruit_CircuitPython_Display_Button#34 from adafruit/patch-fix > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_Logging to 3.7.4 from 3.7.3: > Merge pull request adafruit/Adafruit_CircuitPython_Logging#25 from JingleheimerSE/add-time-format-specifier > First part of patch Updating https://github.com/adafruit/Adafruit_CircuitPython_MacroPad to 2.0.4 from 2.0.3: > Merge pull request adafruit/Adafruit_CircuitPython_MacroPad#34 from adafruit/patch-fix > First part of patch > update rtd py version Updating https://github.com/adafruit/Adafruit_CircuitPython_Simple_Text_Display to 1.2.2 from 1.2.1: > Merge pull request adafruit/Adafruit_CircuitPython_Simple_Text_Display#10 from adafruit/patch-fix > First part of patch > update rtd py version
Addresses Issue #55 by ignoring COMMENTS which I think should solve the majority of issues causing that failure mode, though I really don't work with fonts enough to know that for sure. This seems the best middle ground of not parsing a whole file for FONTBOUNDINGBOX when it doesn't exist and taking up time, and not making something non-abstract nitty gritty a configurable option. But again, I don't know fonts! Happy to change as necessary :)