diff --git a/client/components/App.vue b/client/components/App.vue index 37a61bd9..c13316cf 100644 --- a/client/components/App.vue +++ b/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'); -} - diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index ba8cc68b..1f616736 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/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, - Georgia: 0, - Tahoma: 0, - Helvetica: 0, - CenturySchoolbook: 0, + OpenSans: 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) { diff --git a/client/components/fonts/arial-narrow.ttf b/client/components/fonts/arial-narrow.ttf deleted file mode 100644 index 180e20d2..00000000 Binary files a/client/components/fonts/arial-narrow.ttf and /dev/null differ diff --git a/client/components/fonts/arial-narrow.woff b/client/components/fonts/arial-narrow.woff deleted file mode 100644 index 48ae66c2..00000000 Binary files a/client/components/fonts/arial-narrow.woff and /dev/null differ diff --git a/client/components/fonts/arial.ttf b/client/components/fonts/arial.ttf deleted file mode 100644 index 084f0622..00000000 Binary files a/client/components/fonts/arial.ttf and /dev/null differ diff --git a/client/components/fonts/arial.woff b/client/components/fonts/arial.woff deleted file mode 100644 index e6cdcacc..00000000 Binary files a/client/components/fonts/arial.woff and /dev/null differ diff --git a/client/components/fonts/century-schoolbook.ttf b/client/components/fonts/century-schoolbook.ttf deleted file mode 100644 index f3951021..00000000 Binary files a/client/components/fonts/century-schoolbook.ttf and /dev/null differ diff --git a/client/components/fonts/century-schoolbook.woff b/client/components/fonts/century-schoolbook.woff deleted file mode 100644 index 3888c477..00000000 Binary files a/client/components/fonts/century-schoolbook.woff and /dev/null differ diff --git a/client/components/fonts/comic-sans-ms.ttf b/client/components/fonts/comic-sans-ms.ttf deleted file mode 100644 index 22d56947..00000000 Binary files a/client/components/fonts/comic-sans-ms.ttf and /dev/null differ diff --git a/client/components/fonts/comic-sans-ms.woff b/client/components/fonts/comic-sans-ms.woff deleted file mode 100644 index f9aaf8bd..00000000 Binary files a/client/components/fonts/comic-sans-ms.woff and /dev/null differ diff --git a/client/components/fonts/georgia.ttf b/client/components/fonts/georgia.ttf deleted file mode 100644 index 317b8516..00000000 Binary files a/client/components/fonts/georgia.ttf and /dev/null differ diff --git a/client/components/fonts/georgia.woff b/client/components/fonts/georgia.woff deleted file mode 100644 index 078453a9..00000000 Binary files a/client/components/fonts/georgia.woff and /dev/null differ diff --git a/client/components/fonts/helvetica.ttf b/client/components/fonts/helvetica.ttf deleted file mode 100644 index d944a13f..00000000 Binary files a/client/components/fonts/helvetica.ttf and /dev/null differ diff --git a/client/components/fonts/helvetica.woff b/client/components/fonts/helvetica.woff deleted file mode 100644 index 66d9328a..00000000 Binary files a/client/components/fonts/helvetica.woff and /dev/null differ diff --git a/client/components/fonts/tahoma.ttf b/client/components/fonts/tahoma.ttf deleted file mode 100644 index f5a011e9..00000000 Binary files a/client/components/fonts/tahoma.ttf and /dev/null differ diff --git a/client/components/fonts/tahoma.woff b/client/components/fonts/tahoma.woff deleted file mode 100644 index 55b0d201..00000000 Binary files a/client/components/fonts/tahoma.woff and /dev/null differ