Удалил коммерческие шрифты

client/components/App.vue

@@ -269,18 +269,6 @@ body, html, #app {
        url('fonts/reader-default.ttf') format('truetype');
 }
 
-@font-face {
-  font-family: 'Arial';
-  src: url('fonts/arial.woff') format('woff'),
-       url('fonts/arial.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'ComicSansMS';
-  src: url('fonts/comic-sans-ms.woff') format('woff'),
-       url('fonts/comic-sans-ms.ttf') format('truetype');
-}
-
 @font-face {
   font-family: 'OpenSans';
   src: url('fonts/open-sans.woff') format('woff'),
@@ -292,35 +280,4 @@ body, html, #app {
   src: url('fonts/roboto.woff') format('woff'),
        url('fonts/roboto.ttf') format('truetype');
 }
-
-@font-face {
-  font-family: 'ArialNarrow';
-  src: url('fonts/arial-narrow.woff') format('woff'),
-       url('fonts/arial-narrow.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'Georgia';
-  src: url('fonts/georgia.woff') format('woff'),
-       url('fonts/georgia.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'Tahoma';
-  src: url('fonts/tahoma.woff') format('woff'),
-       url('fonts/tahoma.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'Helvetica';
-  src: url('fonts/helvetica.woff') format('woff'),
-       url('fonts/helvetica.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'CenturySchoolbook';
-  src: url('fonts/century-schoolbook.woff') format('woff'),
-       url('fonts/century-schoolbook.ttf') format('truetype');
-}
-
 </style>

client/components/Reader/TextPage/TextPage.vue

@@ -168,15 +168,8 @@ class TextPage extends Vue {
         //preloaded fonts
         this.fontShifts = {//%
             ReaderDefault: 0,
-            Arial: 10,
-            ComicSansMS: -12,
-            OpenSans: 0,
             Roboto: 0,
-            ArialNarrow: 0,
+            OpenSans: 0,
-            Georgia: 0,
-            Tahoma: 0,
-            Helvetica: 0,
-            CenturySchoolbook: 0,
         }
         this.fontList = [];
         for (let fontName in this.fontShifts)
@@ -187,7 +180,8 @@ class TextPage extends Vue {
         this.backgroundColor = '#478355';
         this.fontStyle = '';// 'bold','italic'
         this.fontSize = 33;// px
-        this.fontName = 'Tahoma';
+        this.fontName = 'ReaderDefault';
+        this.fontCss = '';
         this.lineInterval = 7;// px, межстрочный интервал
         this.textAlignJustify = true;// выравнивание по ширине
         this.p = 50;// px, отступ параграфа
@@ -232,6 +226,7 @@ class TextPage extends Vue {
                 this.parsed = parsed;
                 this.calcDrawProps();
 
+                //await this.loadFontCss();
                 await this.loadFonts();
 
                 this.draw();
@@ -423,7 +418,7 @@ class TextPage extends Vue {
 
     prepareNextPage() {
         // подготовка следующей страницы заранее        
-        if (!this.book || !this.parsed.textLength)
+        if (!this.book || !this.parsed.textLength || !this.linesDown)
             return;
         
         if (!this.preparing) {