Repository navigation
Conversation
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…rosspoint-reader#2280) Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…rosspoint-reader#2325) ## Summary Non-functional cleanup: `ChapterHtmlSlimParser::` prefix is redundant when calling `applyDirectionToEntry` within `ChapterHtmlSlimParser` methods. --- ### AI Usage Did you use AI tools to help write this code? _**NO**_
## Summary This PR adds the [Libre Baskerville ](https://github.com/impallari/Libre-Baskerville) font family to the fonts available for download in CrossPoint. ## Additional Context Baskerville is a classic font family, widely available in some form or the other in most ereaders and widely used in publishing and in the academy. Libre Baskerville is a libre (SIL Open Font License v1) implementation of it, which makes it possible for CrossPoint to ship it without issues.  --- ### AI Usage Did you use AI tools to help write this code? _**NO**_
…t-reader#2321) (crosspoint-reader#2341) Co-authored-by: Uri Tauber <uritaube@gmail.com>
Co-authored-by: Rafael Santos <rmsantos@applaudostudios.com>
…-merge # Conflicts: # lib/EpdFont/scripts/fontconvert_sdcard.py # lib/Epub/Epub/Section.cpp # lib/KOReaderSync/ProgressMapper.cpp # lib/Typesetter/Typesetter/ParsedText.cpp # lib/Typesetter/Typesetter/blocks/BlockStyle.h # src/MappedInputManager.h # src/main.cpp Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NopywjRFiuAhMXszeZ1oJo
znelson
force-pushed
the
upstream-merge
branch
from
September 28, 2026 21:26
b9e467d to
586d72b
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
Upstream sync
Upstream commits merged (
eb987351..90039d7f, 12 first-parent commits):#2279)#2280)#2323)#2325)#2324)#2088)#2331)#2320)#2342)#2321) (#2341)#2352)#2308)Resolutions
lib/KOReaderSync/ProgressMapper.cpp(#2308): feature removed - kept deleted (auto-reaped per.upstream-sync.yaml).lib/Epub/Epub/Section.cpp: relocated tolib/Typesetter; upstream's change was the FILE_VERSION 25->26 bump already ported in fix: Hanging indent causes overlapping words #131 - kept deleted.lib/Typesetter/Typesetter/ParsedText.cpp: upstream's first-line indent fix (#2320) auto-merged via rename detection; 5 refactor collisions (TextAlign enum, bidi scratch buffers, implicit narrowing) resolved to LightPoint's form.lib/Typesetter/Typesetter/blocks/BlockStyle.h:fromCssStylelives inBlockStyleFactory.hhere; upstream's comment fix ported there.src/main.cpp+src/MappedInputManager.h: upstream's newMappedInputManager(gpio, renderer)constructor (#2341) reconciled with LightPoint'shalGPIO/halDisplayglobals; renderer declared first.lib/EpdFont/scripts/fontconvert_sdcard.py: combined LightPoint's synthetic-glyph skip with upstream's Noto Sans punctuation fallback (#2331).Section::FILE_VERSION26 -> 27. Upstream#2320changes serialized layout (EmSpace-prepend hack replaced by computed indent) without bumping; LightPoint already shipped 26, so cached sections must regenerate.vietnamese.yamlnormalized byscripts/normalize_locales.py: 378 -> 273 lines (99 removed-feature keys dropped, STR_CROSSPOINT renamed and rebranded, English-identical values stripped, no_ordercollision).kazakh.yaml: one stray empty value dropped (normalizer baseline;STR_TO_PREFIXfalls back to English identically).Verification
upstream_sync.py verifypassed: i18n regen,normalize_locales --check,reap --check, clang-format (12 changed sources),pio run.MERGE WITH A MERGE COMMIT - NEVER SQUASH. Squashing flattens the upstream graph out of main and poisons every future sync (see upstream-merge-process doc).
🤖 Generated with Claude Code
https://claude.ai/code/session_01NopywjRFiuAhMXszeZ1oJo