Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

bump crengine: ODT support, more typography languages (#6675)

Browse Source 
Includes:
- Update German hyphenation patterns
- (Upstream) Adds ODT (ODF) format support
- TextLang, hyphenation: add Basque, Croatian, Esperanto,
  Estonian, Georgian, Latvian, Lithuanian, Macedonian,
  Occitan, Welsh; update Bulgarian, Irish, Portuguese,
  Slovak, Dutch, Norwegian, Spanish; update hyphen min
  for Czech, English, Greek; fix Romanian and Ukrainian
  pattern file names
- HyphMan: adds HyphMethod::getLeft/RightHyphenMin()
- epub.css: update HR default style
- fb2.css: keep <date> in main text left-aligned
- getRenderedWidths(): inline-block and table fixes
- CSS: avoid style hash mismatch when serializing content:''
- Tables: re-order row groups when necessary
- XML parsing: don't drop trailing text
- HTML parser: tweak implicit head/body insertion code
- Fix text search failure when blank at start or end

readertypography.lua: some cleanup by removing the first
table listing hyph dicts, and including their filenames
in the second table so we can build the first table
dynamically. Also fetch hyph left/right min limits from
crengine to not have to duplicate them here and keep them
in sync.
css_tweaks.lua: for in-page footnotes, switched from
"-cr-only-if: epub-document" to ": -fb2-document"
("not" FB2 documents), so these tweaks also work with
DocX and ODT footnotes.

Also included in base bump:
- KOPTContext: add comic panel detection function/additional
  leptonica declarations
- Forcibly disable docs when building giflib
reviewable/pr6682/r1
poire-z 4 years ago committed by GitHub
parent b4214d3f16
commit 4d53ec76fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 61 additions and 76 deletions
Show Stats Download Patch File Download Diff File

2
base

@ -1 +1 @@
Subproject commit f146a4f4ec0c1debefbe30d03ca6229c4f95452b Subproject commit 50a965c28fd5ea2100257aa9ce2e62c9c301155c

126
frontend/apps/reader/modules/readertypography.lua
Unescape Escape View File

@ -12,41 +12,15 @@ local C_ = _.pgettext
local T = require("ffi/util").template local T = require("ffi/util").template
local Screen = Device.screen local Screen = Device.screen
-- Mostly for migrating hyph settings, and to know the dict -- This is used to migrate old hyph settings, and to show the currently
-- left and right hyph min values (2/2 when not specified) -- used hyph dict language in the hyphenation menu.
-- It will be completed with info from the LANGUAGES table below.
local HYPH_DICT_NAME_TO_LANG_NAME_TAG = { local HYPH_DICT_NAME_TO_LANG_NAME_TAG = {
["@none"] = { "@none", "en" }, ["@none"] = { "@none", "en" },
["@softhyphens"] = { "@softhyphens", "en" }, ["@softhyphens"] = { "@softhyphens", "en" },
["@algorithm"] = { "@algorithm", "en" }, ["@algorithm"] = { "@algorithm", "en" },
["Bulgarian.pattern"] = { _("Bulgarian"), "bg" }, -- Old filenames with typos, before they were renamed
["Catalan.pattern"] = { _("Catalan"), "ca" },
["Czech.pattern"] = { _("Czech"), "cs" },
["Danish.pattern"] = { _("Danish"), "da" },
["Dutch.pattern"] = { _("Dutch"), "nl" },
["English_GB.pattern"] = { _("English (UK)"), "en-GB" },
["English_US.pattern"] = { _("English (US)"), "en-US" },
["Finnish.pattern"] = { _("Finnish"), "fi" },
["French.pattern"] = { _("French"), "fr", 2, 1 },
["Galician.pattern"] = { _("Galician"), "gl" },
["German.pattern"] = { _("German"), "de" },
["Greek.pattern"] = { _("Greek"), "el" },
["Hungarian.pattern"] = { _("Hungarian"), "hu" },
["Icelandic.pattern"] = { _("Icelandic"), "is" },
["Irish.pattern"] = { _("Irish"), "ga" },
["Italian.pattern"] = { _("Italian"), "it" },
["Norwegian.pattern"] = { _("Norwegian"), "no" },
["Polish.pattern"] = { _("Polish"), "pl" },
["Portuguese.pattern"] = { _("Portuguese"), "pt" },
["Roman.pattern"] = { _("Romanian"), "ro" }, ["Roman.pattern"] = { _("Romanian"), "ro" },
["Russian_EnGB.pattern"] = { _("Russian + English (UK)"), "ru-GB" },
["Russian_EnUS.pattern"] = { _("Russian + English (US)"), "ru-US" },
["Russian.pattern"] = { _("Russian"), "ru" },
["Serbian.pattern"] = { _("Serbian"), "sr" },
["Slovak.pattern"] = { _("Slovak"), "sk" },
["Slovenian.pattern"] = { _("Slovenian"), "sl" },
["Spanish.pattern"] = { _("Spanish"), "es" },
["Swedish.pattern"] = { _("Swedish"), "sv" },
["Turkish.pattern"] = { _("Turkish"), "tr" },
["Ukrain.pattern"] = { _("Ukrainian"), "uk" }, ["Ukrain.pattern"] = { _("Ukrainian"), "uk" },
} }
@ -57,43 +31,58 @@ local HYPH_DICT_NAME_TO_LANG_NAME_TAG = {
-- H = language specific hyphenation dictionary -- H = language specific hyphenation dictionary
-- b = language specific line breaking rules -- b = language specific line breaking rules
-- B = language specific additional line breaking tweaks -- B = language specific additional line breaking tweaks
-- The "hyphenation file name" field is used to
-- update HYPH_DICT_NAME_TO_LANG_NAME_TAG. If multiple
-- languages were to use the same hyphenation pattern,
-- just set it for one language, whose name will be
-- used in the Hyphenation sub-menu.
-- Update them when language tweaks and features are added to crengine/src/textlang.cpp -- Update them when language tweaks and features are added to crengine/src/textlang.cpp
local LANGUAGES = { local LANGUAGES = {
-- lang-tag aliases features menu title -- lang-tag aliases features menu title hyphenation file name
{ "bg", {"bul"}, "H ", _("Bulgarian") }, { "eu", {}, "H ", _("Basque"), "Basque.pattern" },
{ "ca", {"cat"}, "H ", _("Catalan") }, { "bg", {"bul"}, "H ", _("Bulgarian"), "Bulgarian.pattern" },
{ "ca", {"cat"}, "H ", _("Catalan"), "Catalan.pattern" },
{ "zh-CN", {"zh", "zh-Hans"}, " b ", _("Chinese (Simplified)") }, { "zh-CN", {"zh", "zh-Hans"}, " b ", _("Chinese (Simplified)") },
{ "zh-TW", {"zh-Hant"}, " b ", _("Chinese (Traditional)") }, { "zh-TW", {"zh-Hant"}, " b ", _("Chinese (Traditional)") },
{ "cs", {"ces"}, "HB ", _("Czech") }, { "hr", {}, "H ", _("Croatian"), "Croatian.pattern" },
{ "da", {"dan"}, "H ", _("Danish") }, { "cs", {"ces"}, "HB ", _("Czech"), "Czech.pattern" },
{ "nl", {"nld"}, "H ", _("Dutch") }, { "da", {"dan"}, "H ", _("Danish"), "Danish.pattern" },
{ "en-GB", {}, "Hb ", _("English (UK)") }, { "nl", {"nld"}, "H ", _("Dutch"), "Dutch.pattern" },
{ "en-US", {"en", "eng"}, "Hb ", _("English (US)") }, { "en-GB", {}, "Hb ", _("English (UK)"), "English_GB.pattern" },
{ "fi", {"fin"}, "H ", _("Finnish") }, { "en-US", {"en", "eng"}, "Hb ", _("English (US)"), "English_US.pattern" },
{ "fr", {"fra", "fre"}, "Hb ", _("French") }, { "eo", {"epo"}, "H ", _("Esperanto"), "Esperanto.pattern" },
{ "gl", {"glg"}, "H ", _("Galician") }, { "et", {"est"}, "H ", _("Estonian"), "Estonian.pattern" },
{ "de", {"deu"}, "Hb ", _("German") }, { "fi", {"fin"}, "H ", _("Finnish"), "Finnish.pattern" },
{ "el", {"ell"}, "H ", _("Greek") }, { "fr", {"fra", "fre"}, "Hb ", _("French"), "French.pattern" },
{ "hu", {"hun"}, "H ", _("Hungarian") }, { "gl", {"glg"}, "H ", _("Galician"), "Galician.pattern" },
{ "is", {"isl"}, "H ", _("Icelandic") }, { "ka", {}, "H ", _("Georgian"), "Georgian.pattern" },
{ "ga", {"gle"}, "H ", _("Irish") }, { "de", {"deu"}, "Hb ", _("German"), "German.pattern" },
{ "it", {"ita"}, "H ", _("Italian") }, { "el", {"ell"}, "H ", _("Greek"), "Greek.pattern" },
{ "hu", {"hun"}, "H ", _("Hungarian"), "Hungarian.pattern" },
{ "is", {"isl"}, "H ", _("Icelandic"), "Icelandic.pattern" },
{ "ga", {"gle"}, "H ", _("Irish"), "Irish.pattern" },
{ "it", {"ita"}, "H ", _("Italian"), "Italian.pattern" },
{ "ja", {}, " ", _("Japanese") }, { "ja", {}, " ", _("Japanese") },
{ "ko", {}, " ", _("Korean") }, { "ko", {}, " ", _("Korean") },
{ "no", {"nor"}, "H ", _("Norwegian") }, { "lv", {"lav"}, "H ", _("Latvian"), "Latvian.pattern" },
{ "pl", {"pol"}, "HB ", _("Polish") }, { "lt", {"lit"}, "H ", _("Lithuanian"), "Lithuanian.pattern" },
{ "pt", {"por"}, "HB ", _("Portuguese") }, { "mk", {""}, "H ", _("Macedonian"), "Macedonian.pattern" },
{ "ro", {"ron"}, "H ", _("Romanian") }, { "no", {"nor"}, "H ", _("Norwegian"), "Norwegian.pattern" },
{ "ru-GB", {}, "Hb ", _("Russian + English (UK)") }, { "oc", {"oci"}, "H ", _("Occitan"), "Occitan.pattern" },
{ "ru-US", {}, "Hb ", _("Russian + English (US)") }, { "pl", {"pol"}, "HB ", _("Polish"), "Polish.pattern" },
{ "ru", {"rus"}, "Hb ", _("Russian") }, { "pt", {"por"}, "HB ", _("Portuguese"), "Portuguese.pattern" },
{ "sr", {"srp"}, "HB ", _("Serbian") }, { "ro", {"ron"}, "H ", _("Romanian"), "Romanian.pattern" },
{ "sk", {"slk"}, "HB ", _("Slovak") }, { "ru-GB", {}, "Hb ", _("Russian + English (UK)"), "Russian_EnGB.pattern" },
{ "sl", {"slv"}, "H ", _("Slovenian") }, { "ru-US", {}, "Hb ", _("Russian + English (US)"), "Russian_EnUS.pattern" },
{ "es", {"spa"}, "Hb ", _("Spanish") }, { "ru", {"rus"}, "Hb ", _("Russian"), "Russian.pattern" },
{ "sv", {"swe"}, "H ", _("Swedish") }, { "sr", {"srp"}, "HB ", _("Serbian"), "Serbian.pattern" },
{ "tr", {"tur"}, "H ", _("Turkish") }, { "sk", {"slk"}, "HB ", _("Slovak"), "Slovak.pattern" },
{ "uk", {"ukr"}, "H ", _("Ukrainian") } { "sl", {"slv"}, "H ", _("Slovenian"), "Slovenian.pattern" },
{ "es", {"spa"}, "Hb ", _("Spanish"), "Spanish.pattern" },
{ "sv", {"swe"}, "H ", _("Swedish"), "Swedish.pattern" },
{ "tr", {"tur"}, "H ", _("Turkish"), "Turkish.pattern" },
{ "uk", {"ukr"}, "H ", _("Ukrainian"), "Ukrainian.pattern" },
{ "cy", {"cym"}, "H ", _("Welsh"), "Welsh.pattern" },
} }
local DEFAULT_LANG_TAG = "en-US" -- English_US.pattern is loaded by default in crengine local DEFAULT_LANG_TAG = "en-US" -- English_US.pattern is loaded by default in crengine
@ -101,13 +90,16 @@ local DEFAULT_LANG_TAG = "en-US" -- English_US.pattern is loaded by default in c
local LANG_TAG_TO_LANG_NAME = {} local LANG_TAG_TO_LANG_NAME = {}
local LANG_ALIAS_TO_LANG_TAG = {} local LANG_ALIAS_TO_LANG_TAG = {}
for __, v in ipairs(LANGUAGES) do for __, v in ipairs(LANGUAGES) do
local lang_tag, lang_aliases, lang_features, lang_name = unpack(v) -- luacheck: no unused local lang_tag, lang_aliases, lang_features, lang_name, hyph_filename = unpack(v) -- luacheck: no unused
LANG_TAG_TO_LANG_NAME[lang_tag] = lang_name LANG_TAG_TO_LANG_NAME[lang_tag] = lang_name
if lang_aliases and #lang_aliases > 0 then if lang_aliases and #lang_aliases > 0 then
for ___, alias in ipairs(lang_aliases) do for ___, alias in ipairs(lang_aliases) do
LANG_ALIAS_TO_LANG_TAG[alias] = lang_tag LANG_ALIAS_TO_LANG_TAG[alias] = lang_tag
end end
end end
if hyph_filename then
HYPH_DICT_NAME_TO_LANG_NAME_TAG[hyph_filename] = { lang_name, lang_tag }
end
end end
local ReaderTypography = InputContainer:new{} local ReaderTypography = InputContainer:new{}
@ -390,15 +382,7 @@ When the book's language tag is not among our presets, no specific features will
end, end,
callback = function() callback = function()
local DoubleSpinWidget = require("/ui/widget/doublespinwidget") local DoubleSpinWidget = require("/ui/widget/doublespinwidget")
-- We will show the defaults for the current main language hyph dict local hyph_alg, alg_left_hyphen_min, alg_right_hyphen_min = cre.getSelectedHyphDict() -- luacheck: no unused
local alg_left_hyphen_min = 2
local alg_right_hyphen_min = 2
local hyph_alg = cre.getSelectedHyphDict()
local hyph_dict_info = HYPH_DICT_NAME_TO_LANG_NAME_TAG[hyph_alg]
if hyph_dict_info then
alg_left_hyphen_min = hyph_dict_info[3] or 2
alg_right_hyphen_min = hyph_dict_info[4] or 2
end
local hyph_limits_widget = DoubleSpinWidget:new{ local hyph_limits_widget = DoubleSpinWidget:new{
-- Min (1) and max (10) values are enforced by crengine -- Min (1) and max (10) values are enforced by crengine
-- Note that when hitting "Use language defaults", we show the default -- Note that when hitting "Use language defaults", we show the default

1
frontend/document/credocument.lua
Unescape Escape View File

@ -1032,6 +1032,7 @@ function CreDocument:register(registry)
registry:addProvider("md", "text/plain", self) registry:addProvider("md", "text/plain", self)
registry:addProvider("md.zip", "application/zip", self) registry:addProvider("md.zip", "application/zip", self)
registry:addProvider("mobi", "application/x-mobipocket-ebook", self, 90) registry:addProvider("mobi", "application/x-mobipocket-ebook", self, 90)
registry:addProvider("odt", "application/vnd.oasis.opendocument.text ", self, 90)
-- Palmpilot Document File -- Palmpilot Document File
registry:addProvider("pdb", "application/vnd.palm", self, 90) registry:addProvider("pdb", "application/vnd.palm", self, 90)
-- Palmpilot Resource File -- Palmpilot Resource File

8
frontend/ui/data/css_tweaks.lua
Unescape Escape View File

@ -716,7 +716,7 @@ body[name="comments"] > section
description = _([[ description = _([[
Show EPUB footnote text at the bottom of pages that contain links to them. Show EPUB footnote text at the bottom of pages that contain links to them.
This only works with footnotes that have specific attributes set by the publisher.]]), This only works with footnotes that have specific attributes set by the publisher.]]),
-- Restrict this to EPUB documents, as FB2 can have <a type="note"> -- Restrict this to non-FB2 documents, as FB2 can have <a type="note">
css = [[ css = [[
*[type~="note"], *[type~="note"],
*[type~="footnote"], *[type~="footnote"],
@ -725,7 +725,7 @@ This only works with footnotes that have specific attributes set by the publishe
*[role~="doc-footnote"], *[role~="doc-footnote"],
*[role~="doc-rearnote"] *[role~="doc-rearnote"]
{ {
-cr-only-if: epub-document; -cr-only-if: -fb2-document;
-cr-hint: footnote-inpage; -cr-hint: footnote-inpage;
margin: 0 !important; margin: 0 !important;
} }
@ -737,7 +737,7 @@ This only works with footnotes that have specific attributes set by the publishe
description = _([[ description = _([[
Show EPUB footnote text at the bottom of pages that contain links to them. Show EPUB footnote text at the bottom of pages that contain links to them.
This only works with footnotes that have specific attributes set by the publisher.]]), This only works with footnotes that have specific attributes set by the publisher.]]),
-- Restrict this to EPUB documents, as FB2 can have <a type="note"> -- Restrict this to non-FB2 documents, as FB2 can have <a type="note">
-- and we don't want to have them smaller -- and we don't want to have them smaller
css = [[ css = [[
*[type~="note"], *[type~="note"],
@ -747,7 +747,7 @@ This only works with footnotes that have specific attributes set by the publishe
*[role~="doc-footnote"], *[role~="doc-footnote"],
*[role~="doc-rearnote"] *[role~="doc-rearnote"]
{ {
-cr-only-if: epub-document; -cr-only-if: -fb2-document;
-cr-hint: footnote-inpage; -cr-hint: footnote-inpage;
margin: 0 !important; margin: 0 !important;
font-size: 0.8rem !important; font-size: 0.8rem !important;

Write Preview
Loading…
Cancel
Save