bump crengine: support for 'box-sizing', and other fixes

Includes among others:
- (Upstream) Various CHM handling fixes, and others
- HTML documents: rebuild TOC from headings after load
- Font: use metrics for underline offset and thickness
- epub.css, html5.css: tweak ruby styling
- CSS: fix EPUB's head>style content encoding
- CSS: add support for 'box-sizing: content-box/border-box'
- CSS: support for styling the <html> element

Also bump KoboUSBMS to v1.2.2 and FBInk to v1.24.0.

ReaderFont's "Generate font test document": update the
generated HTML so its ToC is build from proper HTML headings.
pull/8169/head
poire-z 3 years ago
parent 85cfb552cb
commit 57d7fd8aaa

@ -1 +1 @@
Subproject commit 7711a0abc3f2d603e96c18c31a4b7ee885ab2de5 Subproject commit 2a526000d9c0a92e4951caef9202d0f12e8b343b

@ -440,18 +440,19 @@ function ReaderFont:buildFontsTestDocument()
<head> <head>
<title>%s</title> <title>%s</title>
<style> <style>
section > title { h1 {
font-size: large; font-size: large;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
page-break-before: always; page-break-before: always;
margin-top: 0;
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
a { color: black; } a { color: black; }
</style> </style>
</head> </head>
<body> <body>
<section id="list"><title>%s</title></section> <h1>%s</h1>
]], _("Available fonts test document"), _("AVAILABLE FONTS"))) ]], _("Available fonts test document"), _("AVAILABLE FONTS")))
local face_list = cre.getFontFaces() local face_list = cre.getFontFaces()
f:write("<div style='margin: 2em'>\n") f:write("<div style='margin: 2em'>\n")
@ -462,7 +463,7 @@ a { color: black; }
f:write("</div>\n\n") f:write("</div>\n\n")
for _, font_name in ipairs(face_list) do for _, font_name in ipairs(face_list) do
local font_id = font_name:gsub(" ", "_"):gsub("'", "_") local font_id = font_name:gsub(" ", "_"):gsub("'", "_")
f:write(string.format("<section id='%s'><title>%s</title></section>\n", font_id, font_name)) f:write(string.format("<h1 id='%s'>%s</h1>\n", font_id, font_name))
f:write(string.format("<div style='font-family: %s'>\n", font_name)) f:write(string.format("<div style='font-family: %s'>\n", font_name))
f:write(html_sample) f:write(html_sample)
f:write("\n</div>\n\n") f:write("\n</div>\n\n")

Loading…
Cancel
Save