From 51b39f0775bc5013323828ebe9e8aa0bc6a9d4cd Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 4 Mar 2019 23:28:27 +0700
Subject: [PATCH 1/3] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/BookConverter/ConvertPdf.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/core/BookConverter/ConvertPdf.js b/server/core/BookConverter/ConvertPdf.js
index 967bcdaa..77f1142c 100644
--- a/server/core/BookConverter/ConvertPdf.js
+++ b/server/core/BookConverter/ConvertPdf.js
@@ -43,6 +43,7 @@ class ConvertPdf extends ConvertHtml {
         let title = '';
         let prevTop = 0;
         let i = -1;
+        let titleCount = 0;
 
         const loadImage = async(image) => {
             const src = path.parse(image.src);
@@ -76,8 +77,10 @@ class ConvertPdf extends ConvertHtml {
                 tClose += (bold ? '</b>' : '');
 
                 lines[i].text += `${tOpen}${text}${tClose} `;
-                if (i < 2)
-                    title += text + ' ';
+                if (titleCount < 2 && text.trim() != '') {
+                    title += text + (titleCount ? '' : ' - ');
+                    titleCount++;
+                }
             }
         };
 

From b51a57403860b667aa16bd4bd35326ee2fcd3066 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 5 Mar 2019 18:37:08 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=81=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/LoaderPage/LoaderPage.vue     | 8 +++++---
 client/components/Reader/SettingsPage/SettingsPage.vue | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue
index 684e0e73..3f2bedfb 100644
--- a/client/components/Reader/LoaderPage/LoaderPage.vue
+++ b/client/components/Reader/LoaderPage/LoaderPage.vue
@@ -2,9 +2,10 @@
     <div ref="main" class="main">
         <div class="part">
             <span class="greeting bold-font">{{ title }}</span>
+            <div class="space"></div>
             <span class="greeting">Добро пожаловать!</span>
             <span class="greeting">Поддерживаются форматы: <b>fb2, html, txt</b> и сжатие: <b>zip, bz2, gz</b></span>
-            <span v-if="isExternalConverter" class="greeting">...а также: <b>rtf, doc, docx, pdf, epub, mobi</b></span>
+            <span v-if="isExternalConverter" class="greeting">...а также форматы: <b>rtf, doc, docx, pdf, epub, mobi</b></span>
         </div>
 
         <div class="part center">
@@ -129,6 +130,7 @@ class LoaderPage extends Vue {
     flex: 1;
     display: flex;
     flex-direction: column;
+    min-height: 340px;
 }
 
 .part {
@@ -140,8 +142,8 @@ class LoaderPage extends Vue {
 }
 
 .greeting {
-    font-size: 130%;
-    line-height: 170%;
+    font-size: 120%;
+    line-height: 160%;
 }
 
 .bold-font {
diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index 477ad5cb..e24ac197 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -251,7 +251,7 @@
                         <el-form :model="form" size="mini" label-width="120px" @submit.native.prevent>
                             <div class="partHeader">Анимация</div>
 
-                            <el-form-item label="Вид">
+                            <el-form-item label="Тип">
                                 <el-col :span="11">
                                     <el-select v-model="pageChangeAnimation">
                                         <el-option label="Нет" value=""></el-option>

From 5fd73ac1e1cb9c58bedab4b3cd7b15a9550de2e0 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 5 Mar 2019 18:37:41 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=200.5.?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5e422b4c..7b58717c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "engines": {
     "node": ">=10.0.0"
   },