Merge branch 'release/0.5.6'

0.5.5

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%;
+    font-size: 120%;
-    line-height: 170%;
+    line-height: 160%;
 }
 
 .bold-font {

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>

client/components/Reader/TextPage/DrawHelper.js

@@ -28,7 +28,7 @@ export default class DrawHelper {
 
         let out = `<div style="width: ${this.w}px; height: ${this.h + (isScrolling ? this.lineHeight : 0)}px;` + 
             ` position: absolute; top: ${this.fontSize*this.textShift}px; color: ${this.textColor}; font: ${font}; ${justify}` +
-            ` line-height: ${this.lineHeight}px; white-space: nowrap; overflow: hidden;">`;
+            ` line-height: ${this.lineHeight}px; white-space: nowrap;">`;
 
         let imageDrawn = new Set();
         let len = lines.length;

client/components/Reader/TextPage/TextPage.vue

@@ -4,13 +4,13 @@
             <div v-html="background"></div>
             <!-- img -->
         </div>
-        <div ref="scrollBox1" class="layout" style="overflow: hidden" @wheel.prevent.stop="onMouseWheel">
+        <div ref="scrollBox1" class="layout over-hidden" @wheel.prevent.stop="onMouseWheel">
-            <div ref="scrollingPage1" class="layout" @transitionend="onPage1TransitionEnd" @animationend="onPage1AnimationEnd">
+            <div ref="scrollingPage1" class="layout over-hidden" @transitionend="onPage1TransitionEnd" @animationend="onPage1AnimationEnd">
                 <div v-html="page1"></div>
             </div>
         </div>
-        <div ref="scrollBox2" class="layout" style="overflow: hidden" @wheel.prevent.stop="onMouseWheel">
+        <div ref="scrollBox2" class="layout over-hidden" @wheel.prevent.stop="onMouseWheel">
-            <div ref="scrollingPage2" class="layout" @transitionend="onPage2TransitionEnd" @animationend="onPage2AnimationEnd">
+            <div ref="scrollingPage2" class="layout over-hidden" @transitionend="onPage2TransitionEnd" @animationend="onPage2AnimationEnd">
                 <div v-html="page2"></div>
             </div>
         </div>
@@ -157,9 +157,11 @@ class TextPage extends Vue {
         this.$refs.layoutEvents.style.height = this.realHeight + 'px';
 
         this.w = this.realWidth - 2*this.indentLR;
-        this.h = this.realHeight - (this.showStatusBar ? this.statusBarHeight : 0) - 2*this.indentTB;
+        this.scrollHeight = this.realHeight - (this.showStatusBar ? this.statusBarHeight : 0);
+        this.h = this.scrollHeight - 2*this.indentTB;
         this.lineHeight = this.fontSize + this.lineInterval;
-        this.pageLineCount = 1 + Math.floor((this.h - this.fontSize)/this.lineHeight);
+        this.pageLineCount = 1 + Math.floor((this.h - this.lineHeight + this.lineInterval/2)/this.lineHeight);
+        this.pageSpace = this.scrollHeight - this.pageLineCount*this.lineHeight;
 
         this.$refs.scrollingPage1.style.width = this.w + 'px';
         this.$refs.scrollingPage2.style.width = this.w + 'px';
@@ -193,6 +195,7 @@ class TextPage extends Vue {
         this.drawHelper.indentLR = this.indentLR;
         this.drawHelper.textAlignJustify = this.textAlignJustify;
         this.drawHelper.lineHeight = this.lineHeight;
+        this.drawHelper.pageSpace = this.pageSpace;
         this.drawHelper.context = this.context;
 
         //сообщение "Загрузка шрифтов..."
@@ -232,20 +235,26 @@ class TextPage extends Vue {
         this.statusBarClickable = this.drawHelper.statusBarClickable(this.statusBarTop, this.statusBarHeight);
 
         //scrolling page
-        const pageDelta = this.h - (this.pageLineCount*this.lineHeight - this.lineInterval);
+        let y = this.pageSpace/2;
-        let y = this.indentTB + pageDelta/2;
         if (this.showStatusBar)
             y += this.statusBarHeight*(this.statusBarTop ? 1 : 0);
-        const page1 = this.$refs.scrollBox1;
+        let page1 = this.$refs.scrollBox1;
-        const page2 = this.$refs.scrollBox2;
+        let page2 = this.$refs.scrollBox2;
-        page1.style.width = this.w + 'px';
+        page1.style.width = this.w + this.indentLR + 'px';
-        page2.style.width = this.w + 'px';
+        page2.style.width = this.w + this.indentLR + 'px';
-        page1.style.height = (this.h - pageDelta) + 'px';
+        page1.style.height = this.scrollHeight - (this.pageSpace > 0 ? this.pageSpace : 0) + 'px';
-        page2.style.height = (this.h - pageDelta) + 'px';
+        page2.style.height = this.scrollHeight - (this.pageSpace > 0 ? this.pageSpace : 0) + 'px';
         page1.style.top = y + 'px';
         page2.style.top = y + 'px';
         page1.style.left = this.indentLR + 'px';
         page2.style.left = this.indentLR + 'px';
+
+        page1 = this.$refs.scrollingPage1;
+        page2 = this.$refs.scrollingPage2;
+        page1.style.width = this.w + this.indentLR + 'px';
+        page2.style.width = this.w + this.indentLR + 'px';
+        page1.style.height = this.scrollHeight + this.lineHeight + 'px';
+        page2.style.height = this.scrollHeight + this.lineHeight + 'px';
     }
 
     async checkLoadedFonts() {
@@ -633,8 +642,14 @@ class TextPage extends Vue {
                         duration, this.pageChangeDirectionDown, transition1Finish);
                     break;
                 case 'downShift':
+                    page1.style.height = this.scrollHeight + 'px';
+                    page2.style.height = this.scrollHeight + 'px';
+
                     await this.drawHelper.doPageAnimationDownShift(page1, page2, 
                         duration, this.pageChangeDirectionDown, transition1Finish);
+
+                    page1.style.height = this.scrollHeight + this.lineHeight + 'px';
+                    page2.style.height = this.scrollHeight + this.lineHeight + 'px';
                     break;
             }
             
@@ -1098,6 +1113,10 @@ class TextPage extends Vue {
     z-index: 10;
 }
 
+.over-hidden {
+    overflow: hidden;
+}
+
 .back {
     z-index: 5;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "engines": {
     "node": ">=10.0.0"
   },

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)
+                if (titleCount < 2 && text.trim() != '') {
-                    title += text + ' ';
+                    title += text + (titleCount ? '' : ' - ');
+                    titleCount++;
+                }
             }
         };