From 3483d78c2c82d6d7676033e51fdde96960d8503b Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Mon, 4 Mar 2019 22:28:11 +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?=20pdf=20=D0=B8=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/BookConverter/ConvertHtml.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/core/BookConverter/ConvertHtml.js b/server/core/BookConverter/ConvertHtml.js index 0ba57090..feb0889f 100644 --- a/server/core/BookConverter/ConvertHtml.js +++ b/server/core/BookConverter/ConvertHtml.js @@ -111,6 +111,11 @@ class ConvertHtml extends ConvertBase { }; const onEndNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars + if (!cutCounter) { + if (newPara.has('/' + tag)) + newParagraph(); + } + if (tag == 'title') inTitle = false; @@ -178,6 +183,7 @@ class ConvertHtml extends ConvertBase { newPar(); i++; + let j = 0; const lines = par._t.split('\n'); for (let line of lines) { line = repCrLfTab(line); @@ -187,8 +193,11 @@ class ConvertHtml extends ConvertBase { l++; } - if (l >= parIndent) - newPar(); + if (l >= parIndent) { + if (j > 0) + newPar(); + j++; + } growPar(line.trim() + ' '); } } @@ -199,6 +208,7 @@ class ConvertHtml extends ConvertBase { } //убираем лишнее + pars = body.section._a[0]; for (let i = 0; i < pars.length; i++) pars[i]._t = this.repSpaces(pars[i]._t).trim();