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

Consecutive initial marks/dashes spacing tweak + some sync with Upstream #430

Merged
merged 8 commits into from
Mar 22, 2021

Conversation

poire-z
Copy link
Contributor

@poire-z poire-z commented Mar 21, 2021

(Upstream) Fix rescaled book cover on 4bpp screen

buggins/coolreader@43a4feb

(Upstream) Page splitting: fix possible infinite loop

buggins/coolreader@d698181
Can't trigger it on KOReader.
Quick fix (should probably be ensured earlier) picked just to not diverge.

(Upstream) Correct the language code for Greek

buggins/coolreader@f1d3096
Used with text files when detecting encoding.

(Upstream) Fix typo in LVDocView::propsApply()

buggins/coolreader@3845336

(Upstream) Large files support (engine part)

buggins/coolreader@29707a0
Mostly large zip-files. Integer overflow fixed.

(Upstream) Make crengine.font.fallback.faces plural

buggins/coolreader@e7c85ef
Upstream had been keeping both SetFallbackFontFace() and SetFallbackFontFaces(), and recently removed the former. We've been having only the plural, but kept the setting singular for compatibility.
Make everything plural to keep in sync.

(Upstream) Option to not limit font size to a set

buggins/coolreader@3a2bc01
Previously, the default font size was limited to a (configurable) set of sizes.
This adds an option to not enforce that, and use the requested font size as-is.
(Set USE_LIMITED_FONT_SIZES_SET=0 for KOReader, as cre.cpp needs the correct headers - and it feels awkward to pollute our base/Makefile with such a little -D.)

Text: dont adjust space after consecutive initial marks/dashes

See koreader/koreader#7366 (comment).
Extend 2504a40 to keep doing it when multiple such initial quotation marks/dashes separated by spaces.


This change is Reviewable

virxkane and others added 4 commits March 21, 2021 12:33
Can't trigger it on KOReader.
Quick fix (should probably be ensured earlier) picked
just to not diverge.
Used with text files when detecting encoding.
@NiLuJe
Copy link
Member

NiLuJe commented Mar 21, 2021

Whee, that means we'll be able to get rid of that stupid font sizes array in cre.cpp \o/.

@@ -63,8 +63,8 @@ void MakeStats()
MakeStatsForFile( BASE_DIR "es2-utf8.txt", "utf8", "ee", 2, f, list );
MakeStatsForFile( BASE_DIR "ee3-cp775.txt", "cp775", "ee", 1, f, list );
MakeStatsForFile( BASE_DIR "es3-cp1257.txt", "cp1257", "ee", 2, f, list );
MakeStatsForFile( BASE_DIR "gr1-cp1253.txt", "cp1253", "gr", 1, f, list );
MakeStatsForFile( BASE_DIR "gr1-cp737.txt", "cp737", "gr", 1, f, list );
MakeStatsForFile( BASE_DIR "gr1-cp1253.txt", "cp1253", "el", 1, f, list );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange, didn't we discuss this on our end recently?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that you mention it, that does vaguely ring a bell (perhaps not strictly in the same context, though)...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably in some hyphenation topic, like #373 (comment).

virxkane and others added 4 commits March 21, 2021 21:27
Mostly large zip-files. Integer overflow fixed.
Upstream had been keeping both SetFallbackFontFace() and
SetFallbackFontFaces(), and recently removed the former.
We've been having only the plural, but kept the setting
singular for compatibility.
Make everything plural to keep in sync.
Previously, the default font size was limited to
a (configurable) set of sizes.
This adds an option to not enforce that, and use
the requested font size as-is.
(Set USE_LIMITED_FONT_SIZES_SET=0 for KOReader,
as cre.cpp needs the correct headers.)
Extend 2504a40 to keep doing it when multiple such
initial quotation marks/dashes separated by spaces.
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.

5 participants