From f35e77bae8f6d2880324c5b7d80d93f89f8bd76f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 17 Jan 2019 02:22:26 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/share/BookParser.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/components/Reader/share/BookParser.js b/client/components/Reader/share/BookParser.js
index 4318a0e9..31fbfba3 100644
--- a/client/components/Reader/share/BookParser.js
+++ b/client/components/Reader/share/BookParser.js
@@ -267,11 +267,7 @@ export default class BookParser {
                 !(znak.has(word[i + 2]) && !alpha.has(word[i + 3]))
 
                 ) {
-                if (word[i] != '-')
-                    result.push(slog);
-                else {
-                    result.push(slog.substr(0, slog.length - 1));
-                }
+                result.push(slog);
                 slog = '';
                 slogLen = 0;
             }
@@ -340,9 +336,12 @@ export default class BookParser {
 
                         const slogiLen = slogi.length;
                         for (let k = 0; k < slogiLen - 1; k++) {
-                            let ww = this.measureText(s + slogi[0] + '-') + p;
+                            let slog = slogi[0];
+                            if (slog[slog.length - 1] == '-') //убрать '-' в конце слога, добавим свой
+                                slog = slog.substr(0, slog.length - 1);
+                            let ww = this.measureText(s + slog + '-') + p;
                             if (ww <= parsed.w) {
-                                s += slogi[0];
+                                s += slog;
                             } else 
                                 break;
                             pw = ww;