deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/0.7.7b'

Browse Source
This commit is contained in:
Book Pauk
2019-11-13 19:42:21 +07:00
parent 93586bc5bb b268e9ee74
commit be0f6e57d7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/Reader/BookConverter/ConvertBase.js
View File

@@ -82,7 +82,7 @@ class ConvertBase {
} }
escapeEntities(text) { escapeEntities(text) {
return he.escape(he.decode(text)); return he.escape(he.decode(text.replace(/ /g, ' ')));
} }
formatFb2(fb2) { formatFb2(fb2) {

5
server/core/Reader/BookConverter/ConvertHtml.js
View File

@@ -64,6 +64,7 @@ class ConvertHtml extends ConvertBase {
for (let line of lines) { for (let line of lines) {
if (line.trim() == '') if (line.trim() == '')
continue; continue;
line = repCrLfTab(line); line = repCrLfTab(line);
let l = 0; let l = 0;
@@ -171,7 +172,6 @@ class ConvertHtml extends ConvertBase {
}); });
titleInfo['book-title'] = title; titleInfo['book-title'] = title;
//подозрение на чистый текст, надо разбить на параграфы //подозрение на чистый текст, надо разбить на параграфы
if (isText || pars.length < buf.length/2000) { if (isText || pars.length < buf.length/2000) {
let total = 0; let total = 0;
@@ -257,8 +257,9 @@ class ConvertHtml extends ConvertBase {
pars[i]._t = this.repSpaces(pars[i]._t).trim(); pars[i]._t = this.repSpaces(pars[i]._t).trim();
if (pars[i]._t.indexOf('<') >= 0) { if (pars[i]._t.indexOf('<') >= 0 || bold || italic) {
const t = pars[i]._t; const t = pars[i]._t;
let a = []; let a = [];
const onTextNode = (text) => { const onTextNode = (text) => {