From b268e9ee7473ce9490d45f4dd823ac485e86ac76 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 13 Nov 2019 19:41:20 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3=D0=B0?=
 =?UTF-8?q?=20html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/Reader/BookConverter/ConvertBase.js | 2 +-
 server/core/Reader/BookConverter/ConvertHtml.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/core/Reader/BookConverter/ConvertBase.js b/server/core/Reader/BookConverter/ConvertBase.js
index 3a0e6a0e..d3ad74ce 100644
--- a/server/core/Reader/BookConverter/ConvertBase.js
+++ b/server/core/Reader/BookConverter/ConvertBase.js
@@ -82,7 +82,7 @@ class ConvertBase {
     }
 
     escapeEntities(text) {
-        return he.escape(he.decode(text));
+        return he.escape(he.decode(text.replace(/&nbsp;/g, ' ')));
     }
 
     formatFb2(fb2) {
diff --git a/server/core/Reader/BookConverter/ConvertHtml.js b/server/core/Reader/BookConverter/ConvertHtml.js
index 60d5433f..facb1954 100644
--- a/server/core/Reader/BookConverter/ConvertHtml.js
+++ b/server/core/Reader/BookConverter/ConvertHtml.js
@@ -64,6 +64,7 @@ class ConvertHtml extends ConvertBase {
             for (let line of lines) {
                 if (line.trim() == '')
                     continue;
+
                 line = repCrLfTab(line);
 
                 let l = 0;
@@ -171,7 +172,6 @@ class ConvertHtml extends ConvertBase {
         });
 
         titleInfo['book-title'] = title;
-
         //подозрение на чистый текст, надо разбить на параграфы
         if (isText || pars.length < buf.length/2000) {
             let total = 0;
@@ -257,8 +257,9 @@ class ConvertHtml extends ConvertBase {
 
             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;
+
                 let a = [];
 
                 const onTextNode = (text) => {