ajurna/cbwebreader
1
0
Fork 0
mirror of https://github.com/ajurna/cbwebreader.git synced 2025-12-06 06:17:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pymupdf (#27)

Browse Source 
* added icons.

* change to from pypdf4 to pumupdf so i can render pages for thumbnails.
This commit is contained in:
Ajurna
2021-04-29 16:33:03 +01:00
committed by GitHub
parent f92b96191a
commit 6f538f05f5
10 changed files with 505 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
comic/models.py
View File

@@ -1,3 +1,4 @@
import io
import mimetypes import mimetypes
import uuid import uuid
import zipfile import zipfile
@@ -8,15 +9,15 @@ from os import listdir
from pathlib import Path from pathlib import Path
from typing import Optional, List, Union, Tuple from typing import Optional, List, Union, Tuple
import PyPDF4 import fitz
import PyPDF4.utils
import rarfile import rarfile
from PIL import Image from PIL import Image, UnidentifiedImageError
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.files.uploadedfile import InMemoryUploadedFile from django.core.files.uploadedfile import InMemoryUploadedFile
from django.db import models from django.db import models
from django.db.transaction import atomic from django.db.transaction import atomic
from django.templatetags.static import static
from django.utils.http import urlsafe_base64_encode from django.utils.http import urlsafe_base64_encode
from imagekit.models import ProcessedImageField from imagekit.models import ProcessedImageField
from imagekit.processors import ResizeToFill from imagekit.processors import ResizeToFill
@@ -62,22 +63,18 @@ class Directory(models.Model):
return self.thumbnail.url return self.thumbnail.url
else: else:
self.generate_thumbnail() self.generate_thumbnail()
if self.thumbnail:
return self.thumbnail.url return self.thumbnail.url
else:
return static('img/placeholder.png')
def generate_thumbnail(self): def generate_thumbnail(self):
book = ComicBook.objects.filter(directory=self).order_by('file_name').first() book: ComicBook = ComicBook.objects.filter(directory=self).order_by('file_name').first()
if not book: if not book:
return return
img, content_type = book.get_image(0) if not book.thumbnail:
pil_data = Image.open(img) book.generate_thumbnail()
self.thumbnail = InMemoryUploadedFile( self.thumbnail = book.thumbnail
img,
None,
f'{self.name}.jpg',
content_type,
pil_data.tell(),
None
)
self.save() self.save()
@property @property
@@ -176,9 +173,32 @@ class ComicBook(models.Model):
self.generate_thumbnail() self.generate_thumbnail()
return self.thumbnail.url return self.thumbnail.url
def generate_thumbnail(self, page_index: int = 0): def generate_thumbnail(self, page_index: int = None):
if Path(self.file_name).suffix.lower() == '.pdf':
if page_index:
img, pil_data = self._get_pdf_image(page_index)
else:
img, pil_data = self._get_pdf_image(0)
content_type = 'Image/JPEG'
else:
if page_index:
img, content_type = self.get_image(page_index) img, content_type = self.get_image(page_index)
pil_data = Image.open(img) pil_data = Image.open(img)
else:
for x in range(ComicPage.objects.filter(Comic=self).count()):
try:
img, content_type = self.get_image(x)
pil_data = Image.open(img)
break
except UnidentifiedImageError:
continue
try:
img
content_type
pil_data
except NameError:
return
self.thumbnail = InMemoryUploadedFile( self.thumbnail = InMemoryUploadedFile(
img, img,
None, None,
@@ -189,6 +209,18 @@ class ComicBook(models.Model):
) )
self.save() self.save()
def _get_pdf_image(self, page_index: int):
doc = fitz.open(self.get_pdf())
page = doc[page_index]
pix = page.get_pixmap()
mode = "RGBA" if pix.alpha else "RGB"
pil_data = Image.frombytes(mode, [pix.width, pix.height], pix.samples)
img = io.BytesIO()
pil_data.save(img, format="JPEG")
img.seek(0)
return img, pil_data
def is_last_page(self, page): def is_last_page(self, page):
if (self.page_count - 1) == page: if (self.page_count - 1) == page:
return True return True
@@ -351,7 +383,7 @@ class ComicBook(models.Model):
else: else:
return Path(settings.COMIC_BOOK_VOLUME, self.file_name) return Path(settings.COMIC_BOOK_VOLUME, self.file_name)
def get_archive(self) -> Tuple[Union[rarfile.RarFile, zipfile.ZipFile, PyPDF4.PdfFileReader], str]: def get_archive(self) -> Tuple[Union[rarfile.RarFile, zipfile.ZipFile, fitz.Document], str]:
archive_path = self.get_archive_path archive_path = self.get_archive_path
try: try:
return rarfile.RarFile(archive_path), 'archive' return rarfile.RarFile(archive_path), 'archive'
@@ -363,8 +395,8 @@ class ComicBook(models.Model):
pass pass
try: try:
return PyPDF4.PdfFileReader(str(archive_path)), 'pdf' return fitz.open(str(archive_path)), 'pdf'
except PyPDF4.utils.PyPdfError: except RuntimeError:
pass pass
raise NotCompatibleArchive raise NotCompatibleArchive

4
comic/templates/base.html
View File

@@ -9,7 +9,7 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content="Ajurna"> <meta name="author" content="Ajurna">
<link rel="icon" href="../../favicon.ico"> <link rel="icon" href="{% static "favicon.ico" %}">
<title>{% block title %}CB Reader{% endblock %}</title> <title>{% block title %}CB Reader{% endblock %}</title>
@@ -28,7 +28,7 @@
<body> <body>
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="#">Comic Book Web Reader</a> <a class="navbar-brand" href="/"><img src="{% static 'img/logo.svg' %}" class="d-inline-block align-top" height="35px"> Web Reader</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>

43
icons/1.svg Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Creator: CorelDRAW 2020 (64-Bit) -->
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1.64213in" height="1.64213in" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
viewBox="0 0 9.329 9.329"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xodm="http://www.corel.com/coreldraw/odm/2003">
<defs>
<font id="FontID0" horiz-adv-x="607" font-variant="normal" style="fill-rule:nonzero" font-weight="400">
<font-face
font-family="Humnst777 BlkCn BT">
<font-face-src>
<font-face-name name="Humnst777 BlkCn BT Black"/>
</font-face-src>
</font-face>
<missing-glyph><path d="M0 0z"/></missing-glyph>
<glyph unicode="A" horiz-adv-x="607" d="M304.996 557.341l-82.9886 -282.336 156.83 0 -73.8417 282.336zm-89.3317 136.652l184.179 0 215.159 -693.992 -165.012 0 -39.989 154.992 -222.996 0 -42.0114 -154.992 -154.992 0 225.662 693.992z"/>
<glyph unicode="B" horiz-adv-x="558" d="M220.997 302.009l0 -185.006 38.679 0c39.0007,0 67.3148,7.17044 84.988,21.4883 17.5124,14.3409 26.3376,37.5069 26.3376,69.4981 0,33.3471 -8.66428,57.3405 -26.1767,72.0031 -17.3286,14.6856 -45.8264,22.0169 -85.1489,22.0169l-38.679 0zm0 275.993l0 -169.011 35.6683 0c35.3466,0 60.8338,6.50395 76.6685,19.5119 15.8347,13.0079 23.6716,34.1745 23.6716,63.4997 0,30.3365 -7.99779,52.1695 -24.0164,65.66 -15.9956,13.5135 -42.3331,20.3392 -79.1506,20.3392l-32.8415 0zm-152.004 115.991l213.183 0c77.1511,0 134.492,-14.3179 171.815,-42.9996 37.346,-28.6588 56.0075,-72.9914 56.0075,-132.837 0,-42.6549 -10.8246,-77.4959 -32.4968,-104.5 -21.6722,-27.1649 -52.9969,-44.6543 -93.8362,-52.813 47.665,-8.5034 83.0116,-26.8432 106.338,-55.1802 23.3269,-28.337 35.0018,-67.1539 35.0018,-116.657 0,-64.5109 -20.3392,-112.176 -60.8338,-142.834 -40.4946,-30.8421 -103.673,-46.1712 -189.327,-46.1712l-205.851 0 0 693.992z"/>
<glyph unicode="D" horiz-adv-x="661" d="M228.006 578.001l0 -460.999 20.9827 0c66.0048,0 115.669,19.1671 149.016,57.6623 33.3241,38.3343 49.9862,95.8356 49.9862,172.343 0,78.4841 -16.3173,136.652 -48.998,174.32 -32.6577,37.8286 -82.6669,56.674 -150.005,56.674l-20.9827 0zm-159.014 115.991l177.009 0c126.333,0 219.503,-28.1532 279.67,-84.4824 60.1673,-56.3523 90.3199,-143.685 90.3199,-262.181 0,-113.003 -31.4856,-199.163 -94.6635,-258.503 -63.155,-59.1561 -154.831,-88.8261 -275.326,-88.8261l-177.009 0 0 693.992z"/>
<glyph unicode="E" horiz-adv-x="519" d="M68.9925 693.992l395.017 0 0 -115.991 -236.004 0 0 -166 222.996 0 0 -115.991 -222.996 0 0 -179.008 246.989 0 0 -117.002 -406.003 0 0 693.992z"/>
<glyph unicode="R" horiz-adv-x="566" d="M224.995 578.001l0 -177.997 33.6689 0c39.6672,0 68.1651,6.8257 85.4937,20.5001 17.1677,13.6514 25.832,35.8292 25.832,66.3265 0,33.508 -7.81394,56.9958 -23.6486,70.6702 -15.8347,13.6744 -44.1717,20.5001 -85.1719,20.5001l-36.1739 0zm-156.003 115.991l163.84 0c8.5034,0 17.0068,0.183857 25.832,0.505608 8.82515,0.344732 13.5135,0.505608 14.18,0.505608 88.3205,0 152.487,-14.8465 192.82,-44.6773 40.1728,-29.8309 60.3282,-77.335 60.3282,-142.489 0,-42.6779 -10.9855,-77.8406 -33.1633,-105.511 -22.1548,-27.6705 -54.4907,-46.6538 -96.8239,-57.1566 20.8218,-5.17099 37.323,-15.0074 49.5036,-29.3252 12.3184,-14.3409 24.8207,-41.3449 37.4839,-81.173l76.1629 -234.671 -164.162 0 -55.3181 196.658c-9.67549,35.8522 -20.5001,59.34 -32.3359,70.5093 -11.9967,11.1693 -29.5091,16.8229 -52.5142,16.8229l-29.8309 0 0 -283.991 -156.003 0 0 693.992z"/>
<glyph unicode="W" horiz-adv-x="857" d="M15.0074 693.992l150.993 0 91.8367 -527.992 78.9897 527.992 188.178 0 86.8266 -527.992 88.5043 527.992 138.674 0 -130.837 -693.992 -187.167 0 -92.8479 556.329 -85.3328 -556.329 -188.155 0 -139.663 693.992z"/>
</font>
<style type="text/css">
<![CDATA[
@font-face { font-family:"Humnst777 BlkCn BT";font-variant:normal;font-weight:normal;src:url("#FontID0") format(svg)}
.fil0 {fill:black}
.fil1 {fill:white}
.fil2 {fill:white;fill-rule:nonzero}
.fnt0 {font-weight:normal;font-size:0.973px;font-family:'Humnst777 BlkCn BT'}
]]>
</style>
</defs>
<g id="Layer_x0020_1">
<metadata id="CorelCorpID_0Corel-Layer"/>
<g id="_2266447297824">
<circle class="fil0" cx="4.665" cy="4.665" r="4.665"/>
<text x="1.916" y="7.068" class="fil1 fnt0">WEB READER </text>
<path class="fil2" d="M4.581 2.176l1.49 0c0.256,0 0.489,0.105 0.658,0.273 0.169,0.169 0.273,0.402 0.273,0.658 0,0.222 -0.079,0.427 -0.21,0.587 0.017,0.015 0.034,0.03 0.049,0.046 0.169,0.169 0.273,0.402 0.273,0.658 0,0.256 -0.105,0.489 -0.273,0.658 -0.169,0.169 -0.402,0.273 -0.658,0.273l-1.602 0c-0.158,0 -0.286,-0.128 -0.286,-0.286l0 -2.583c0,-0.158 0.128,-0.286 0.286,-0.286zm1.49 0.571l-1.204 0 0 2.012 1.317 0c0.099,0 0.189,-0.041 0.254,-0.106 0.065,-0.065 0.106,-0.155 0.106,-0.254 0,-0.099 -0.041,-0.189 -0.106,-0.254 -0.065,-0.065 -0.155,-0.106 -0.254,-0.106 -0.076,0 -0.118,0.006 -0.188,-0.022 -0.1,-0.041 -0.173,-0.137 -0.178,-0.252 -0.006,-0.14 0.089,-0.26 0.221,-0.29 0.032,-0.007 0.063,-0.006 0.095,-0.012 0.085,-0.015 0.16,-0.06 0.213,-0.124 0.053,-0.063 0.084,-0.143 0.084,-0.231 0,-0.099 -0.041,-0.189 -0.106,-0.254 -0.065,-0.065 -0.155,-0.106 -0.254,-0.106z"/>
<path class="fil1" d="M4.318 2.351c-0.037,-0.011 -0.1,-0.024 -0.149,-0.032 -0.995,-0.15 -2.046,0.531 -2.071,1.737 -0.043,2.075 2.648,2.593 3.533,0.699l-0.683 0c-0.519,1.047 -2.297,0.693 -2.287,-0.694 0.006,-0.835 0.908,-1.352 1.617,-1.153l0.017 0.005 0 -0.45c0,-0.04 0.008,-0.077 0.023,-0.112z"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

45
icons/2.svg Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Creator: CorelDRAW 2020 (64-Bit) -->
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1.70824in" height="1.70824in" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
viewBox="0 0 11.983 11.983"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xodm="http://www.corel.com/coreldraw/odm/2003">
<defs>
<font id="FontID0" horiz-adv-x="607" font-variant="normal" style="fill-rule:nonzero" font-weight="400">
<font-face
font-family="Humnst777 BlkCn BT">
<font-face-src>
<font-face-name name="Humnst777 BlkCn BT Black"/>
</font-face-src>
</font-face>
<missing-glyph><path d="M0 0z"/></missing-glyph>
<glyph unicode="A" horiz-adv-x="607" d="M304.996 557.341l-82.9886 -282.336 156.83 0 -73.8417 282.336zm-89.3317 136.652l184.179 0 215.159 -693.992 -165.012 0 -39.989 154.992 -222.996 0 -42.0114 -154.992 -154.992 0 225.662 693.992z"/>
<glyph unicode="B" horiz-adv-x="558" d="M220.997 302.009l0 -185.006 38.679 0c39.0007,0 67.3148,7.17044 84.988,21.4883 17.5124,14.3409 26.3376,37.5069 26.3376,69.4981 0,33.3471 -8.66428,57.3405 -26.1767,72.0031 -17.3286,14.6856 -45.8264,22.0169 -85.1489,22.0169l-38.679 0zm0 275.993l0 -169.011 35.6683 0c35.3466,0 60.8338,6.50395 76.6685,19.5119 15.8347,13.0079 23.6716,34.1745 23.6716,63.4997 0,30.3365 -7.99779,52.1695 -24.0164,65.66 -15.9956,13.5135 -42.3331,20.3392 -79.1506,20.3392l-32.8415 0zm-152.004 115.991l213.183 0c77.1511,0 134.492,-14.3179 171.815,-42.9996 37.346,-28.6588 56.0075,-72.9914 56.0075,-132.837 0,-42.6549 -10.8246,-77.4959 -32.4968,-104.5 -21.6722,-27.1649 -52.9969,-44.6543 -93.8362,-52.813 47.665,-8.5034 83.0116,-26.8432 106.338,-55.1802 23.3269,-28.337 35.0018,-67.1539 35.0018,-116.657 0,-64.5109 -20.3392,-112.176 -60.8338,-142.834 -40.4946,-30.8421 -103.673,-46.1712 -189.327,-46.1712l-205.851 0 0 693.992z"/>
<glyph unicode="D" horiz-adv-x="661" d="M228.006 578.001l0 -460.999 20.9827 0c66.0048,0 115.669,19.1671 149.016,57.6623 33.3241,38.3343 49.9862,95.8356 49.9862,172.343 0,78.4841 -16.3173,136.652 -48.998,174.32 -32.6577,37.8286 -82.6669,56.674 -150.005,56.674l-20.9827 0zm-159.014 115.991l177.009 0c126.333,0 219.503,-28.1532 279.67,-84.4824 60.1673,-56.3523 90.3199,-143.685 90.3199,-262.181 0,-113.003 -31.4856,-199.163 -94.6635,-258.503 -63.155,-59.1561 -154.831,-88.8261 -275.326,-88.8261l-177.009 0 0 693.992z"/>
<glyph unicode="E" horiz-adv-x="519" d="M68.9925 693.992l395.017 0 0 -115.991 -236.004 0 0 -166 222.996 0 0 -115.991 -222.996 0 0 -179.008 246.989 0 0 -117.002 -406.003 0 0 693.992z"/>
<glyph unicode="R" horiz-adv-x="566" d="M224.995 578.001l0 -177.997 33.6689 0c39.6672,0 68.1651,6.8257 85.4937,20.5001 17.1677,13.6514 25.832,35.8292 25.832,66.3265 0,33.508 -7.81394,56.9958 -23.6486,70.6702 -15.8347,13.6744 -44.1717,20.5001 -85.1719,20.5001l-36.1739 0zm-156.003 115.991l163.84 0c8.5034,0 17.0068,0.183857 25.832,0.505608 8.82515,0.344732 13.5135,0.505608 14.18,0.505608 88.3205,0 152.487,-14.8465 192.82,-44.6773 40.1728,-29.8309 60.3282,-77.335 60.3282,-142.489 0,-42.6779 -10.9855,-77.8406 -33.1633,-105.511 -22.1548,-27.6705 -54.4907,-46.6538 -96.8239,-57.1566 20.8218,-5.17099 37.323,-15.0074 49.5036,-29.3252 12.3184,-14.3409 24.8207,-41.3449 37.4839,-81.173l76.1629 -234.671 -164.162 0 -55.3181 196.658c-9.67549,35.8522 -20.5001,59.34 -32.3359,70.5093 -11.9967,11.1693 -29.5091,16.8229 -52.5142,16.8229l-29.8309 0 0 -283.991 -156.003 0 0 693.992z"/>
<glyph unicode="W" horiz-adv-x="857" d="M15.0074 693.992l150.993 0 91.8367 -527.992 78.9897 527.992 188.178 0 86.8266 -527.992 88.5043 527.992 138.674 0 -130.837 -693.992 -187.167 0 -92.8479 556.329 -85.3328 -556.329 -188.155 0 -139.663 693.992z"/>
</font>
<style type="text/css">
<![CDATA[
@font-face { font-family:"Humnst777 BlkCn BT";font-variant:normal;font-weight:normal;src:url("#FontID0") format(svg)}
.str0 {stroke:#78EAD5;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2.61313}
.fil0 {fill:none}
.fil1 {fill:#580FEA}
.fil3 {fill:#78EAD5}
.fil2 {fill:#580FEA;fill-rule:nonzero}
.fnt0 {font-weight:normal;font-size:1.202px;font-family:'Humnst777 BlkCn BT'}
]]>
</style>
</defs>
<g id="Layer_x0020_1">
<metadata id="CorelCorpID_0Corel-Layer"/>
<g id="_2302228525984">
<circle class="fil0 str0" cx="5.992" cy="5.992" r="5.76"/>
<text x="2.597" y="8.959" class="fil1 fnt0">WEB READER </text>
<path class="fil2" d="M5.888 2.919l1.84 0c0.317,0 0.604,0.129 0.812,0.338 0.208,0.208 0.338,0.496 0.338,0.812 0,0.274 -0.097,0.527 -0.26,0.725 0.021,0.018 0.041,0.037 0.061,0.057 0.208,0.208 0.338,0.496 0.338,0.812 0,0.317 -0.129,0.604 -0.338,0.813 -0.208,0.208 -0.496,0.338 -0.812,0.338l-1.979 0c-0.195,0 -0.353,-0.158 -0.353,-0.353l0 -3.189c0,-0.195 0.158,-0.353 0.353,-0.353zm1.84 0.705l-1.487 0 0 2.484 1.626 0c0.122,0 0.233,-0.05 0.314,-0.131 0.081,-0.081 0.131,-0.192 0.131,-0.314 0,-0.122 -0.05,-0.233 -0.131,-0.314 -0.081,-0.081 -0.192,-0.131 -0.314,-0.131 -0.094,0 -0.146,0.007 -0.232,-0.028 -0.124,-0.05 -0.213,-0.169 -0.219,-0.311 -0.007,-0.172 0.11,-0.321 0.273,-0.358 0.039,-0.009 0.078,-0.008 0.117,-0.015 0.105,-0.018 0.197,-0.074 0.263,-0.153 0.065,-0.077 0.104,-0.177 0.104,-0.285 0,-0.122 -0.05,-0.233 -0.131,-0.314 -0.081,-0.081 -0.192,-0.131 -0.314,-0.131z"/>
<path class="fil3" d="M5.564 3.135c-0.045,-0.013 -0.123,-0.03 -0.184,-0.039 -1.229,-0.185 -2.527,0.656 -2.557,2.145 -0.053,2.563 3.269,3.202 4.363,0.863l-0.844 0c-0.641,1.293 -2.836,0.856 -2.824,-0.857 0.008,-1.031 1.121,-1.669 1.996,-1.424l0.022 0.006 0 -0.555c0,-0.049 0.01,-0.096 0.028,-0.138z"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

47
icons/3.svg Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Creator: CorelDRAW 2020 (64-Bit) -->
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1.49852in" height="1.75522in" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
viewBox="0 0 7.854 9.199"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xodm="http://www.corel.com/coreldraw/odm/2003">
<defs>
<font id="FontID0" horiz-adv-x="722" font-variant="normal" style="fill-rule:nonzero" font-style="normal" font-weight="700">
<font-face
font-family="Futura Md BT">
<font-face-src>
<font-face-name name="Futura Md BT Bold"/>
</font-face-src>
</font-face>
<missing-glyph><path d="M0 0z"/></missing-glyph>
<glyph unicode="A" horiz-adv-x="722" d="M265.169 266.998l193.83 0 -72.8403 235.995c-2.15538,7.17818 -5.33072,18.6671 -9.16036,34.6785 -4.00285,15.9921 -9.00641,36.4875 -15.1646,61.4861 -4.17605,-17.4932 -8.33285,-34.3321 -12.5089,-50.3243 -3.9836,-15.8382 -8.15965,-31.1568 -12.3165,-45.8403l-71.8396 -235.995zm-273.175 -266.998l246.829 715.009 244.174 0 247.003 -715.009 -193.83 0 -36.1603 127.995 -276.851 0 -37.1611 -127.995 -194.003 0z"/>
<glyph unicode="B" horiz-adv-x="678" d="M256.991 428.998l39.0085 0c48.1689,0 81.1731,5.33072 99.1667,15.8382 17.8396,10.6614 26.8268,29.0014 26.8268,55.0007 0,27 -8.33285,45.8211 -25.1525,56.8289 -16.6657,10.8346 -49.3428,16.3385 -97.8388,16.3385l-42.0107 0 0 -144.006zm-180.994 -428.998l0 715.009 196.178 0c80.6535,0 137.001,-2.67498 169.159,-7.8325 32.0035,-5.17676 59.5039,-14.1832 82.6742,-26.846 26.3264,-14.6643 46.4946,-34.3321 60.3314,-58.8303 13.8368,-24.6714 20.6686,-52.9992 20.6686,-85.3299 0,-40.6635 -10.3343,-72.9942 -31.0028,-97.0113 -20.6686,-23.8246 -53.6728,-41.9914 -99.0128,-54.5003 50.6707,-3.82965 90.5067,-21.65 119.008,-53.3264 28.6742,-31.8303 42.9921,-74.1682 42.9921,-127.341 0,-37.9886 -7.98645,-71.4932 -24.1518,-100.495 -16.0114,-29.0014 -39.1817,-51.4982 -69.0106,-67.3364 -24.325,-12.99 -54.5003,-22.3236 -90.1603,-27.8275 -35.8332,-5.50392 -94.3364,-8.33285 -175.663,-8.33285l-202.009 0zm180.994 146.008l68.3371 0c46.1675,0 78.8446,5.83107 98.012,17.32 19.1675,11.6814 28.655,31.0028 28.655,58.0028 0,30.0021 -8.83321,50.8439 -26.3264,62.8332 -17.4932,11.8353 -49.9971,17.8396 -97.3385,17.8396l-71.3392 0 0 -155.996z"/>
<glyph unicode="D" horiz-adv-x="766" d="M75.9964 0l0 715.009 149.01 0c111.002,0 189.5,-5.17676 235.494,-15.6842 46.1675,-10.315 86.5039,-27.8275 121.336,-52.1525 45.3207,-31.6764 79.6721,-72.1667 102.996,-121.336 23.4975,-49.3428 35.1596,-105.671 35.1596,-168.832 0,-63.1796 -11.6621,-119.335 -35.1596,-168.678 -23.3243,-49.3236 -57.6757,-89.8332 -102.996,-121.49 -34.5053,-23.9978 -73.841,-41.1639 -118.161,-51.4982 -44.1853,-10.1803 -112.85,-15.3378 -205.839,-15.3378l-32.8311 0 -149.01 0zm193.003 159.998l32.6771 0c76.4967,0 132.498,15.665 167.658,47.1682 35.1596,31.33 52.6721,81.1731 52.6721,149.664 0,68.3371 -17.5125,118.334 -52.6721,150.338 -35.1596,31.8303 -91.161,47.8225 -167.658,47.8225l-32.6771 0 0 -394.993z"/>
<glyph unicode="E" horiz-adv-x="566" d="M75.9964 0l0 715.009 438.004 0 0 -157.016 -248.003 0 0 -123.992 233.839 0 0 -152.993 -233.839 0 0 -121.009 248.003 0 0 -159.998 -438.004 0z"/>
<glyph unicode="R" horiz-adv-x="641" d="M75.9964 0l0 715.009 204.011 0c79.6528,0 135.327,-3.67569 166.657,-11.0078 31.33,-7.33214 58.5032,-19.6678 81.3271,-36.8339 25.6721,-19.4946 45.5132,-44.4932 59.3499,-74.6685 13.8175,-30.3293 20.6686,-63.6607 20.6686,-100.167 0,-55.3278 -13.6828,-100.341 -40.8367,-135 -27.3464,-34.6593 -67.0092,-57.6564 -119.181,-68.9914l195.004 -288.34 -220.003 0 -164.001 280.007 0 -280.007 -182.996 0zm182.996 376.999l36.0064 0c42.0107,0 72.6671,7.15894 92.0078,21.4961 19.3214,14.3371 29.0014,36.8339 29.0014,67.3364 0,35.8332 -9.00641,61.3321 -27,76.4967 -18.1668,15.1646 -48.3421,22.67 -91.0071,22.67l-39.0085 0 0 -187.999z"/>
<glyph unicode="W" horiz-adv-x="970" d="M562.997 715.009l89.8332 -340.011c4.17605,-15.1646 8.1789,-31.1568 11.6621,-47.8225 3.67569,-16.5117 7.33214,-35.6792 11.335,-57.1753 4.83036,25.4989 9.00641,46.3407 12.3357,62.8332 3.50249,16.4925 6.83178,30.5025 10.0071,42.1646l84.0021 340.011 196.832 0 -202.163 -715.009 -180.667 0 -88.3321 305.333c-3.34854,10.6614 -8.67925,31.6764 -16.1846,63.0064 -3.15609,13.9907 -5.83107,24.8254 -7.8325,32.6579 -1.50107,-6.83178 -3.82965,-16.4925 -6.83178,-28.8282 -7.4861,-31.6764 -13.1632,-53.8268 -16.9929,-66.836l-87.0042 -305.333 -181.167 0 -201.836 715.009 197.006 0 82.0007 -341.839c4.00285,-17.6664 7.8325,-35.1789 11.5082,-52.8453 3.82965,-17.4932 7.33214,-35.66 10.4882,-54.1539 3.00214,13.6636 6.17747,28.0007 9.50676,42.9921 3.50249,15.0107 8.66001,36.3335 15.4918,64.0071l89.8332 341.839 157.17 0z"/>
</font>
<style type="text/css">
<![CDATA[
@font-face { font-family:"Futura Md BT";font-variant:normal;font-style:normal;font-weight:bold;src:url("#FontID0") format(svg)}
.fil3 {fill:black}
.fil0 {fill:black}
.fil2 {fill:white}
.fil1 {fill:white;fill-rule:nonzero}
.fnt0 {font-weight:bold;font-size:1.072px;font-family:'Futura Md BT'}
]]>
</style>
</defs>
<g id="Layer_x0020_1">
<metadata id="CorelCorpID_0Corel-Layer"/>
<g id="_2302217834304">
<rect class="fil0" x="-0" y="-0" width="7.854" height="7.854" rx="0.483" ry="0.483"/>
<g>
<path class="fil1" d="M5.263 2.669c-0.235,-0.201 -0.485,-0.351 -0.746,-0.451 -0.263,-0.1 -0.539,-0.15 -0.828,-0.15 -0.559,0 -1.014,0.179 -1.365,0.539 -0.351,0.36 -0.527,0.824 -0.527,1.396 0,0.552 0.171,1.008 0.512,1.367 0.342,0.359 0.773,0.539 1.292,0.539 0.303,0 0.591,-0.054 0.866,-0.161 0.273,-0.107 0.536,-0.269 0.788,-0.486l0 0.941c-0.223,0.161 -0.467,0.282 -0.731,0.361 -0.264,0.08 -0.549,0.119 -0.856,0.119 -0.392,0 -0.754,-0.064 -1.086,-0.192 -0.333,-0.129 -0.625,-0.318 -0.877,-0.567 -0.25,-0.245 -0.441,-0.534 -0.576,-0.866 -0.134,-0.332 -0.201,-0.687 -0.201,-1.062 0,-0.376 0.067,-0.728 0.201,-1.058 0.135,-0.331 0.328,-0.62 0.583,-0.869 0.254,-0.252 0.546,-0.443 0.874,-0.572 0.328,-0.13 0.684,-0.195 1.066,-0.195 0.301,0 0.588,0.044 0.86,0.131 0.273,0.088 0.537,0.221 0.794,0.399l-0.045 0.838z"/>
<path class="fil2" d="M4.529 3.593l0.318 0c0.397,0 0.676,-0.054 0.841,-0.162 0.164,-0.109 0.246,-0.291 0.246,-0.547 0,-0.281 -0.075,-0.476 -0.227,-0.59 -0.068,-0.051 -0.162,-0.09 -0.283,-0.118l0.022 -0.413 -0.061 -0.042c-0.162,-0.112 -0.331,-0.21 -0.509,-0.292l0.129 0c0.369,0 0.641,0.02 0.817,0.06 0.177,0.039 0.326,0.105 0.45,0.196 0.159,0.117 0.282,0.27 0.369,0.459 0.087,0.19 0.131,0.398 0.131,0.627 0,0.273 -0.063,0.502 -0.189,0.684 -0.127,0.184 -0.309,0.312 -0.549,0.383 0.299,0.047 0.533,0.183 0.703,0.408 0.171,0.225 0.257,0.509 0.257,0.852 0,0.207 -0.036,0.404 -0.109,0.591 -0.072,0.186 -0.174,0.345 -0.307,0.475 -0.141,0.142 -0.314,0.242 -0.522,0.301 -0.208,0.058 -0.555,0.087 -1.045,0.087l-0.09 0c0.144,-0.068 0.282,-0.149 0.412,-0.243l0.055 -0.04 0 -0.436c0.029,-0.003 0.056,-0.007 0.081,-0.011 0.144,-0.024 0.258,-0.064 0.343,-0.123 0.103,-0.067 0.181,-0.159 0.238,-0.272 0.056,-0.115 0.084,-0.24 0.084,-0.379 0,-0.162 -0.033,-0.306 -0.101,-0.426 -0.068,-0.122 -0.165,-0.216 -0.29,-0.283 -0.079,-0.041 -0.17,-0.069 -0.271,-0.088 -0.102,-0.018 -0.236,-0.027 -0.405,-0.027l-0.251 0 -0.287 0 0 1.352c-0.036,0.016 -0.073,0.032 -0.11,0.046 -0.228,0.089 -0.464,0.138 -0.707,0.149l0 -3.572c0.26,0.003 0.514,0.048 0.757,0.142 0.02,0.008 0.04,0.016 0.06,0.024l0 1.228z"/>
<path class="fil1" d="M5.263 2.669c-0.235,-0.201 -0.485,-0.351 -0.746,-0.451 -0.263,-0.1 -0.539,-0.15 -0.828,-0.15 -0.559,0 -1.014,0.179 -1.365,0.539 -0.351,0.36 -0.527,0.824 -0.527,1.396 0,0.552 0.171,1.008 0.512,1.367 0.342,0.359 0.773,0.539 1.292,0.539 0.303,0 0.591,-0.054 0.866,-0.161 0.273,-0.107 0.536,-0.269 0.788,-0.486l0 0.941c-0.223,0.161 -0.467,0.282 -0.731,0.361 -0.264,0.08 -0.549,0.119 -0.856,0.119 -0.392,0 -0.754,-0.064 -1.086,-0.192 -0.333,-0.129 -0.625,-0.318 -0.877,-0.567 -0.25,-0.245 -0.441,-0.534 -0.576,-0.866 -0.134,-0.332 -0.201,-0.687 -0.201,-1.062 0,-0.376 0.067,-0.728 0.201,-1.058 0.135,-0.331 0.328,-0.62 0.583,-0.869 0.254,-0.252 0.546,-0.443 0.874,-0.572 0.328,-0.13 0.684,-0.195 1.066,-0.195 0.301,0 0.588,0.044 0.86,0.131 0.273,0.088 0.537,0.221 0.794,0.399l-0.045 0.838z"/>
</g>
<text x="0.518" y="9.199" class="fil3 fnt0">WEB READER </text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 8.3 KiB

145
icons/4.svg Normal file
View File

@@ -0,0 +1,145 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xml:space="preserve"
width="5.2083335in"
height="5.2083335in"
version="1.1"
style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
viewBox="0 0 32.77887 32.77723"
id="svg48"
sodipodi:docname="4.svg"
inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
id="metadata52"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1777"
inkscape:window-height="1057"
id="namedview50"
showgrid="false"
inkscape:zoom="0.63130142"
inkscape:cx="-31.625386"
inkscape:cy="264.63314"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_x0020_1" />
<defs
id="defs31">
<font
id="FontID0"
horiz-adv-x="722"
font-variant="normal"
style="fill-rule:nonzero"
font-style="normal"
font-weight="700"
horiz-origin-x="0"
horiz-origin-y="0"
vert-origin-x="512"
vert-origin-y="768"
vert-adv-y="1024">
<font-face
font-family="Futura Md BT"
id="font-face10">
<font-face-src>
<font-face-name
name="Futura Md BT Bold" />
</font-face-src>
</font-face>
<missing-glyph
id="missing-glyph14"><path
d="M0 0z"
id="path12" /></missing-glyph>
<glyph
unicode="A"
horiz-adv-x="722"
d="M265.169 266.998l193.83 0 -72.8403 235.995c-2.15538,7.17818 -5.33072,18.6671 -9.16036,34.6785 -4.00285,15.9921 -9.00641,36.4875 -15.1646,61.4861 -4.17605,-17.4932 -8.33285,-34.3321 -12.5089,-50.3243 -3.9836,-15.8382 -8.15965,-31.1568 -12.3165,-45.8403l-71.8396 -235.995zm-273.175 -266.998l246.829 715.009 244.174 0 247.003 -715.009 -193.83 0 -36.1603 127.995 -276.851 0 -37.1611 -127.995 -194.003 0z"
id="glyph16" />
<glyph
unicode="B"
horiz-adv-x="678"
d="M256.991 428.998l39.0085 0c48.1689,0 81.1731,5.33072 99.1667,15.8382 17.8396,10.6614 26.8268,29.0014 26.8268,55.0007 0,27 -8.33285,45.8211 -25.1525,56.8289 -16.6657,10.8346 -49.3428,16.3385 -97.8388,16.3385l-42.0107 0 0 -144.006zm-180.994 -428.998l0 715.009 196.178 0c80.6535,0 137.001,-2.67498 169.159,-7.8325 32.0035,-5.17676 59.5039,-14.1832 82.6742,-26.846 26.3264,-14.6643 46.4946,-34.3321 60.3314,-58.8303 13.8368,-24.6714 20.6686,-52.9992 20.6686,-85.3299 0,-40.6635 -10.3343,-72.9942 -31.0028,-97.0113 -20.6686,-23.8246 -53.6728,-41.9914 -99.0128,-54.5003 50.6707,-3.82965 90.5067,-21.65 119.008,-53.3264 28.6742,-31.8303 42.9921,-74.1682 42.9921,-127.341 0,-37.9886 -7.98645,-71.4932 -24.1518,-100.495 -16.0114,-29.0014 -39.1817,-51.4982 -69.0106,-67.3364 -24.325,-12.99 -54.5003,-22.3236 -90.1603,-27.8275 -35.8332,-5.50392 -94.3364,-8.33285 -175.663,-8.33285l-202.009 0zm180.994 146.008l68.3371 0c46.1675,0 78.8446,5.83107 98.012,17.32 19.1675,11.6814 28.655,31.0028 28.655,58.0028 0,30.0021 -8.83321,50.8439 -26.3264,62.8332 -17.4932,11.8353 -49.9971,17.8396 -97.3385,17.8396l-71.3392 0 0 -155.996z"
id="glyph18" />
<glyph
unicode="D"
horiz-adv-x="766"
d="M75.9964 0l0 715.009 149.01 0c111.002,0 189.5,-5.17676 235.494,-15.6842 46.1675,-10.315 86.5039,-27.8275 121.336,-52.1525 45.3207,-31.6764 79.6721,-72.1667 102.996,-121.336 23.4975,-49.3428 35.1596,-105.671 35.1596,-168.832 0,-63.1796 -11.6621,-119.335 -35.1596,-168.678 -23.3243,-49.3236 -57.6757,-89.8332 -102.996,-121.49 -34.5053,-23.9978 -73.841,-41.1639 -118.161,-51.4982 -44.1853,-10.1803 -112.85,-15.3378 -205.839,-15.3378l-32.8311 0 -149.01 0zm193.003 159.998l32.6771 0c76.4967,0 132.498,15.665 167.658,47.1682 35.1596,31.33 52.6721,81.1731 52.6721,149.664 0,68.3371 -17.5125,118.334 -52.6721,150.338 -35.1596,31.8303 -91.161,47.8225 -167.658,47.8225l-32.6771 0 0 -394.993z"
id="glyph20" />
<glyph
unicode="E"
horiz-adv-x="566"
d="M75.9964 0l0 715.009 438.004 0 0 -157.016 -248.003 0 0 -123.992 233.839 0 0 -152.993 -233.839 0 0 -121.009 248.003 0 0 -159.998 -438.004 0z"
id="glyph22" />
<glyph
unicode="R"
horiz-adv-x="641"
d="M75.9964 0l0 715.009 204.011 0c79.6528,0 135.327,-3.67569 166.657,-11.0078 31.33,-7.33214 58.5032,-19.6678 81.3271,-36.8339 25.6721,-19.4946 45.5132,-44.4932 59.3499,-74.6685 13.8175,-30.3293 20.6686,-63.6607 20.6686,-100.167 0,-55.3278 -13.6828,-100.341 -40.8367,-135 -27.3464,-34.6593 -67.0092,-57.6564 -119.181,-68.9914l195.004 -288.34 -220.003 0 -164.001 280.007 0 -280.007 -182.996 0zm182.996 376.999l36.0064 0c42.0107,0 72.6671,7.15894 92.0078,21.4961 19.3214,14.3371 29.0014,36.8339 29.0014,67.3364 0,35.8332 -9.00641,61.3321 -27,76.4967 -18.1668,15.1646 -48.3421,22.67 -91.0071,22.67l-39.0085 0 0 -187.999z"
id="glyph24" />
<glyph
unicode="W"
horiz-adv-x="970"
d="M562.997 715.009l89.8332 -340.011c4.17605,-15.1646 8.1789,-31.1568 11.6621,-47.8225 3.67569,-16.5117 7.33214,-35.6792 11.335,-57.1753 4.83036,25.4989 9.00641,46.3407 12.3357,62.8332 3.50249,16.4925 6.83178,30.5025 10.0071,42.1646l84.0021 340.011 196.832 0 -202.163 -715.009 -180.667 0 -88.3321 305.333c-3.34854,10.6614 -8.67925,31.6764 -16.1846,63.0064 -3.15609,13.9907 -5.83107,24.8254 -7.8325,32.6579 -1.50107,-6.83178 -3.82965,-16.4925 -6.83178,-28.8282 -7.4861,-31.6764 -13.1632,-53.8268 -16.9929,-66.836l-87.0042 -305.333 -181.167 0 -201.836 715.009 197.006 0 82.0007 -341.839c4.00285,-17.6664 7.8325,-35.1789 11.5082,-52.8453 3.82965,-17.4932 7.33214,-35.66 10.4882,-54.1539 3.00214,13.6636 6.17747,28.0007 9.50676,42.9921 3.50249,15.0107 8.66001,36.3335 15.4918,64.0071l89.8332 341.839 157.17 0z"
id="glyph26" />
</font>
<style
type="text/css"
id="style29">
<![CDATA[
@font-face { font-family:"Futura Md BT";font-variant:normal;font-style:normal;font-weight:bold;src:url("#FontID0") format(svg)}
.fil2 {fill:#336666}
.fil0 {fill:#E6E6E6}
.fil1 {fill:#003333;fill-rule:nonzero}
.fnt0 {font-weight:bold;font-size:1.287px;font-family:'Futura Md BT'}
]]>
</style>
</defs>
<g
id="Layer_x0020_1"
transform="translate(11.673934,11.673698)">
<metadata
id="CorelCorpID_0Corel-Layer" />
<g
id="_2302217657600"
transform="matrix(3.4756515,0,0,3.4756515,-11.673934,-11.673934)">
<rect
class="fil0"
x="0"
y="0"
width="9.4309998"
height="9.4309998"
rx="0.57999998"
ry="0.57999998"
id="rect34" />
<g
id="g42">
<path
class="fil1"
d="M 6.32,3.205 C 6.038,2.964 5.738,2.783 5.424,2.663 5.108,2.543 4.777,2.482 4.43,2.482 3.759,2.482 3.212,2.697 2.791,3.129 2.369,3.561 2.159,4.119 2.159,4.805 c 0,0.662 0.205,1.21 0.615,1.642 0.41,0.432 0.928,0.647 1.552,0.647 0.364,0 0.71,-0.065 1.04,-0.194 C 5.694,6.771 6.01,6.577 6.312,6.316 v 1.13 C 6.044,7.64 5.751,7.785 5.434,7.879 5.117,7.975 4.774,8.022 4.406,8.022 3.936,8.022 3.501,7.945 3.102,7.791 2.702,7.636 2.352,7.41 2.049,7.11 1.749,6.816 1.52,6.469 1.358,6.07 1.197,5.671 1.117,5.245 1.117,4.795 1.117,4.343 1.197,3.92 1.358,3.525 1.52,3.128 1.752,2.781 2.058,2.481 2.363,2.178 2.713,1.949 3.108,1.794 3.502,1.638 3.93,1.56 4.389,1.56 4.75,1.56 5.095,1.613 5.422,1.718 5.75,1.824 6.067,1.983 6.376,2.197 L 6.321,3.204 Z"
id="path36" />
<path
class="fil2"
d="M 5.438,4.315 H 5.819 C 6.295,4.315 6.631,4.25 6.829,4.12 7.025,3.99 7.124,3.77 7.124,3.463 7.124,3.126 7.034,2.891 6.852,2.755 6.771,2.694 6.658,2.647 6.512,2.614 L 6.539,2.118 6.466,2.067 C 6.272,1.932 6.068,1.814 5.854,1.717 h 0.155 c 0.443,0 0.77,0.024 0.981,0.072 C 7.202,1.836 7.381,1.915 7.531,2.024 7.722,2.165 7.87,2.348 7.974,2.575 8.079,2.803 8.132,3.053 8.132,3.328 8.132,3.656 8.056,3.93 7.905,4.15 7.753,4.371 7.534,4.524 7.245,4.61 7.603,4.666 7.885,4.829 8.09,5.1 8.295,5.37 8.398,5.711 8.398,6.123 8.398,6.371 8.355,6.608 8.268,6.833 8.182,7.057 8.059,7.247 7.899,7.404 7.73,7.575 7.522,7.695 7.272,7.765 7.022,7.835 6.605,7.87 6.017,7.87 H 5.909 C 6.082,7.789 6.248,7.691 6.404,7.578 L 6.47,7.53 V 7.006 C 6.505,7.002 6.537,6.998 6.567,6.993 6.74,6.964 6.877,6.916 6.979,6.845 7.102,6.765 7.197,6.654 7.264,6.518 7.331,6.38 7.364,6.23 7.364,6.063 7.364,5.868 7.324,5.696 7.242,5.551 7.16,5.405 7.044,5.291 6.893,5.211 6.798,5.162 6.689,5.128 6.567,5.105 6.445,5.083 6.283,5.072 6.081,5.072 H 5.78 5.436 V 6.696 C 5.393,6.716 5.349,6.734 5.304,6.752 5.03,6.859 4.747,6.918 4.455,6.932 V 2.643 c 0.312,0.003 0.617,0.058 0.909,0.17 0.024,0.009 0.048,0.019 0.072,0.029 v 1.474 z"
id="path38" />
<path
class="fil1"
d="M 6.32,3.205 C 6.038,2.964 5.738,2.783 5.424,2.663 5.108,2.543 4.777,2.482 4.43,2.482 3.759,2.482 3.212,2.697 2.791,3.129 2.369,3.561 2.159,4.119 2.159,4.805 c 0,0.662 0.205,1.21 0.615,1.642 0.41,0.432 0.928,0.647 1.552,0.647 0.364,0 0.71,-0.065 1.04,-0.194 C 5.694,6.771 6.01,6.577 6.312,6.316 v 1.13 C 6.044,7.64 5.751,7.785 5.434,7.879 5.117,7.975 4.774,8.022 4.406,8.022 3.936,8.022 3.501,7.945 3.102,7.791 2.702,7.636 2.352,7.41 2.049,7.11 1.749,6.816 1.52,6.469 1.358,6.07 1.197,5.671 1.117,5.245 1.117,4.795 1.117,4.343 1.197,3.92 1.358,3.525 1.52,3.128 1.752,2.781 2.058,2.481 2.363,2.178 2.713,1.949 3.108,1.794 3.502,1.638 3.93,1.56 4.389,1.56 4.75,1.56 5.095,1.613 5.422,1.718 5.75,1.824 6.067,1.983 6.376,2.197 L 6.321,3.204 Z"
id="path40" />
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

45
poetry.lock generated
View File

@@ -109,18 +109,15 @@ django = "*"
[[package]] [[package]]
name = "django-bootstrap4" name = "django-bootstrap4"
version = "2.3.1" version = "3.0.0"
description = "Bootstrap support for Django projects" description = "Bootstrap 4 for Django"
category = "main" category = "main"
optional = false optional = false
python-versions = ">=3.6,<4.0" python-versions = ">=3.6"
[package.dependencies] [package.dependencies]
beautifulsoup4 = ">=4.8.0,<5.0.0" beautifulsoup4 = ">=4.8.0"
django = ">=2.2,<4.0" Django = ">=2.2"
[package.extras]
docs = ["sphinx (>=2.4,<3.0)", "sphinx_rtd_theme (>=0.4.3,<0.5.0)", "m2r2 (>=0.2.5,<0.3.0)"]
[[package]] [[package]]
name = "django-extensions" name = "django-extensions"
@@ -320,9 +317,9 @@ optional = false
python-versions = ">=3.5" python-versions = ">=3.5"
[[package]] [[package]]
name = "pypdf4" name = "pymupdf"
version = "1.27.0" version = "1.18.12"
description = "PDF toolkit" description = "Python bindings for the PDF rendering library MuPDF"
category = "main" category = "main"
optional = false optional = false
python-versions = "*" python-versions = "*"
@@ -458,7 +455,7 @@ dev = ["pytest (>=4.6.2)", "black (>=19.3b0)"]
[metadata] [metadata]
lock-version = "1.1" lock-version = "1.1"
python-versions = "^3.8" python-versions = "^3.8"
content-hash = "05469ef9d59ad0de19cda78ddb8511654d50ac61d14eca9ca2ebac3605a3973c" content-hash = "c099b73f4400e26ba585774697d71eb475d22e365ad1ce9e6699086b30f403ad"
[metadata.files] [metadata.files]
asgiref = [ asgiref = [
@@ -553,8 +550,8 @@ django-appconf = [
{file = "django_appconf-1.0.4-py2.py3-none-any.whl", hash = "sha256:1b1d0e1069c843ebe8ae5aa48ec52403b1440402b320c3e3a206a0907e97bb06"}, {file = "django_appconf-1.0.4-py2.py3-none-any.whl", hash = "sha256:1b1d0e1069c843ebe8ae5aa48ec52403b1440402b320c3e3a206a0907e97bb06"},
] ]
django-bootstrap4 = [ django-bootstrap4 = [
{file = "django-bootstrap4-2.3.1.tar.gz", hash = "sha256:2c199020ac38866cdf8d1c5561ce7468116b9685b455a29843c0225ef8568879"}, {file = "django-bootstrap4-3.0.0.tar.gz", hash = "sha256:bffc96f65386fbd49cae1474393e01d4b414c12fcab0fff50545e6142e7ba19b"},
{file = "django_bootstrap4-2.3.1-py3-none-any.whl", hash = "sha256:b68f073b647b20ec7894a252a0ca4e06b7b8dafdbad995cb0cdc783d0bb4629d"}, {file = "django_bootstrap4-3.0.0-py3-none-any.whl", hash = "sha256:76a52fb22a8d3dbb2f7609b21908ce863e941a4462be079bf1d12025e551af37"},
] ]
django-extensions = [ django-extensions = [
{file = "django-extensions-3.1.3.tar.gz", hash = "sha256:5f0fea7bf131ca303090352577a9e7f8bfbf5489bd9d9c8aea9401db28db34a0"}, {file = "django-extensions-3.1.3.tar.gz", hash = "sha256:5f0fea7bf131ca303090352577a9e7f8bfbf5489bd9d9c8aea9401db28db34a0"},
@@ -741,8 +738,24 @@ pygments = [
{file = "Pygments-2.8.1-py3-none-any.whl", hash = "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8"}, {file = "Pygments-2.8.1-py3-none-any.whl", hash = "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8"},
{file = "Pygments-2.8.1.tar.gz", hash = "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94"}, {file = "Pygments-2.8.1.tar.gz", hash = "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94"},
] ]
pypdf4 = [ pymupdf = [
{file = "PyPDF4-1.27.0.tar.gz", hash = "sha256:7c932441146d205572f96254d53c79ea2c30c9e11df55a5cf87e056c7b3d7f89"}, {file = "PyMuPDF-1.18.12-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:fc63949b63990baa4b738a151bc2d745e3b0d0bc0be5ac2e4fc14f4898d99a70"},
{file = "PyMuPDF-1.18.12-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:742cb9bf84bd67d7fc8824c9fc69d8fb1eea47480749c7fd5dbcf7954df1fb9a"},
{file = "PyMuPDF-1.18.12-cp36-cp36m-win32.whl", hash = "sha256:19a228af7b9438bf59f1ec52202ac6f014202046dab182f82acb6efdbf6f9e4b"},
{file = "PyMuPDF-1.18.12-cp36-cp36m-win_amd64.whl", hash = "sha256:ba60a8ecbae946f36390ba32315235480a35af1a8304bc1927d9e36b87707b70"},
{file = "PyMuPDF-1.18.12-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:9fa9bcc6b6f0fce3f15426f3b9c2e1fd92643dfcd6ce24621339a33074405002"},
{file = "PyMuPDF-1.18.12-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:d2082f1e7728abc90ad69e4081d0aed4f75858f95c61ab91fedeb44f35a17011"},
{file = "PyMuPDF-1.18.12-cp37-cp37m-win32.whl", hash = "sha256:a1b5e2612d120c9c17ea803ed0bfc326228ce9b0be12d068a1a9704336d4e242"},
{file = "PyMuPDF-1.18.12-cp37-cp37m-win_amd64.whl", hash = "sha256:77554e5fd49342192ae12f11836bf355212c8711a4f38af22fc3090a039cf678"},
{file = "PyMuPDF-1.18.12-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:08c0b1ce23537b6abb87e6e0711fb823507530ab246cb211ae67b9e418e18ae8"},
{file = "PyMuPDF-1.18.12-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:73f0f354040ebb7c7ab04f27993a08c8c1223ac63e2a5863d04ef8fe4b91cfc5"},
{file = "PyMuPDF-1.18.12-cp38-cp38-win32.whl", hash = "sha256:412c130c30ee3723950a56cf58598657279fff164d7efbf358bb1a663aec42d0"},
{file = "PyMuPDF-1.18.12-cp38-cp38-win_amd64.whl", hash = "sha256:d81c3da49cb95bdd991a4abf6b5653501a3e597a89aa981ef1afddf9a56e88bb"},
{file = "PyMuPDF-1.18.12-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:819ec801866a11febf35045dbe0006600ac435d4cd5480d81074cc98b03ace4b"},
{file = "PyMuPDF-1.18.12-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:41f708d8e4031beb7b07853c1362c76d86991b2acf6d86167db093b91962364f"},
{file = "PyMuPDF-1.18.12-cp39-cp39-win32.whl", hash = "sha256:813c7be49208f224cdecede26aab780ba4814ffd1346ef2a4f740d413944b57e"},
{file = "PyMuPDF-1.18.12-cp39-cp39-win_amd64.whl", hash = "sha256:9a4e1e5b80b518480b9518b22b103a2947824ee39e0d66743c3b3ced35086523"},
{file = "PyMuPDF-1.18.12.tar.gz", hash = "sha256:daf48e7a34ae25f0507688c350431e59d4207326347cbfcc767960c3039555fb"},
] ]
python-dateutil = [ python-dateutil = [
{file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"},

6
pyproject.toml
View File

@@ -3,7 +3,7 @@ line_length = 119
[tool.poetry] [tool.poetry]
name = "cbwebreader" name = "cbwebreader"
version = "0.1.1" version = "0.2"
description = "CBR/Z Web Reader" description = "CBR/Z Web Reader"
authors = ["ajurna <ajurna@gmail.com>"] authors = ["ajurna <ajurna@gmail.com>"]
license = "Creative Commons Attribution-ShareAlike 4.0 International License" license = "Creative Commons Attribution-ShareAlike 4.0 International License"
@@ -13,9 +13,7 @@ python = "^3.8"
Django = "^3.1.2" Django = "^3.1.2"
gunicorn = "^20.0.4" gunicorn = "^20.0.4"
django-recaptcha2 = "^1.4.1" django-recaptcha2 = "^1.4.1"
django-bootstrap4 = "^2.3.1"
dj-database-url = "^0.5.0" dj-database-url = "^0.5.0"
PyPDF4 = "^1.27.0"
python-dotenv = "^0.15.0" python-dotenv = "^0.15.0"
loguru = "^0.5.3" loguru = "^0.5.3"
django-silk = "^4.1.0" django-silk = "^4.1.0"
@@ -26,6 +24,8 @@ coverage = "^5.5"
django-extensions = "^3.1.3" django-extensions = "^3.1.3"
Pillow = "^8.2.0" Pillow = "^8.2.0"
django-imagekit = "^4.0.2" django-imagekit = "^4.0.2"
PyMuPDF = "^1.18.12"
django-bootstrap4 = "^3.0.0"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
mypy = "^0.812" mypy = "^0.812"

BIN
static/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

138
static/img/logo.svg Normal file
View File

@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xml:space="preserve"
width="5.2083335in"
height="5.2083335in"
version="1.1"
style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
viewBox="0 0 32.77887 32.77723"
id="svg48"
sodipodi:docname="logo.svg"
inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
id="metadata52"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1777"
inkscape:window-height="1057"
id="namedview50"
showgrid="false"
inkscape:zoom="0.63130142"
inkscape:cx="-31.625386"
inkscape:cy="264.63314"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="_2302217657600"
inkscape:document-rotation="0" />
<defs
id="defs31">
<font
id="FontID0"
horiz-adv-x="722"
font-variant="normal"
style="fill-rule:nonzero"
font-style="normal"
font-weight="700"
horiz-origin-x="0"
horiz-origin-y="0"
vert-origin-x="512"
vert-origin-y="768"
vert-adv-y="1024">
<font-face
font-family="Futura Md BT"
id="font-face10">
<font-face-src>
<font-face-name
name="Futura Md BT Bold" />
</font-face-src>
</font-face>
<missing-glyph
id="missing-glyph14"><path
d="M0 0z"
id="path12" /></missing-glyph>
<glyph
unicode="A"
horiz-adv-x="722"
d="M265.169 266.998l193.83 0 -72.8403 235.995c-2.15538,7.17818 -5.33072,18.6671 -9.16036,34.6785 -4.00285,15.9921 -9.00641,36.4875 -15.1646,61.4861 -4.17605,-17.4932 -8.33285,-34.3321 -12.5089,-50.3243 -3.9836,-15.8382 -8.15965,-31.1568 -12.3165,-45.8403l-71.8396 -235.995zm-273.175 -266.998l246.829 715.009 244.174 0 247.003 -715.009 -193.83 0 -36.1603 127.995 -276.851 0 -37.1611 -127.995 -194.003 0z"
id="glyph16" />
<glyph
unicode="B"
horiz-adv-x="678"
d="M256.991 428.998l39.0085 0c48.1689,0 81.1731,5.33072 99.1667,15.8382 17.8396,10.6614 26.8268,29.0014 26.8268,55.0007 0,27 -8.33285,45.8211 -25.1525,56.8289 -16.6657,10.8346 -49.3428,16.3385 -97.8388,16.3385l-42.0107 0 0 -144.006zm-180.994 -428.998l0 715.009 196.178 0c80.6535,0 137.001,-2.67498 169.159,-7.8325 32.0035,-5.17676 59.5039,-14.1832 82.6742,-26.846 26.3264,-14.6643 46.4946,-34.3321 60.3314,-58.8303 13.8368,-24.6714 20.6686,-52.9992 20.6686,-85.3299 0,-40.6635 -10.3343,-72.9942 -31.0028,-97.0113 -20.6686,-23.8246 -53.6728,-41.9914 -99.0128,-54.5003 50.6707,-3.82965 90.5067,-21.65 119.008,-53.3264 28.6742,-31.8303 42.9921,-74.1682 42.9921,-127.341 0,-37.9886 -7.98645,-71.4932 -24.1518,-100.495 -16.0114,-29.0014 -39.1817,-51.4982 -69.0106,-67.3364 -24.325,-12.99 -54.5003,-22.3236 -90.1603,-27.8275 -35.8332,-5.50392 -94.3364,-8.33285 -175.663,-8.33285l-202.009 0zm180.994 146.008l68.3371 0c46.1675,0 78.8446,5.83107 98.012,17.32 19.1675,11.6814 28.655,31.0028 28.655,58.0028 0,30.0021 -8.83321,50.8439 -26.3264,62.8332 -17.4932,11.8353 -49.9971,17.8396 -97.3385,17.8396l-71.3392 0 0 -155.996z"
id="glyph18" />
<glyph
unicode="D"
horiz-adv-x="766"
d="M75.9964 0l0 715.009 149.01 0c111.002,0 189.5,-5.17676 235.494,-15.6842 46.1675,-10.315 86.5039,-27.8275 121.336,-52.1525 45.3207,-31.6764 79.6721,-72.1667 102.996,-121.336 23.4975,-49.3428 35.1596,-105.671 35.1596,-168.832 0,-63.1796 -11.6621,-119.335 -35.1596,-168.678 -23.3243,-49.3236 -57.6757,-89.8332 -102.996,-121.49 -34.5053,-23.9978 -73.841,-41.1639 -118.161,-51.4982 -44.1853,-10.1803 -112.85,-15.3378 -205.839,-15.3378l-32.8311 0 -149.01 0zm193.003 159.998l32.6771 0c76.4967,0 132.498,15.665 167.658,47.1682 35.1596,31.33 52.6721,81.1731 52.6721,149.664 0,68.3371 -17.5125,118.334 -52.6721,150.338 -35.1596,31.8303 -91.161,47.8225 -167.658,47.8225l-32.6771 0 0 -394.993z"
id="glyph20" />
<glyph
unicode="E"
horiz-adv-x="566"
d="M75.9964 0l0 715.009 438.004 0 0 -157.016 -248.003 0 0 -123.992 233.839 0 0 -152.993 -233.839 0 0 -121.009 248.003 0 0 -159.998 -438.004 0z"
id="glyph22" />
<glyph
unicode="R"
horiz-adv-x="641"
d="M75.9964 0l0 715.009 204.011 0c79.6528,0 135.327,-3.67569 166.657,-11.0078 31.33,-7.33214 58.5032,-19.6678 81.3271,-36.8339 25.6721,-19.4946 45.5132,-44.4932 59.3499,-74.6685 13.8175,-30.3293 20.6686,-63.6607 20.6686,-100.167 0,-55.3278 -13.6828,-100.341 -40.8367,-135 -27.3464,-34.6593 -67.0092,-57.6564 -119.181,-68.9914l195.004 -288.34 -220.003 0 -164.001 280.007 0 -280.007 -182.996 0zm182.996 376.999l36.0064 0c42.0107,0 72.6671,7.15894 92.0078,21.4961 19.3214,14.3371 29.0014,36.8339 29.0014,67.3364 0,35.8332 -9.00641,61.3321 -27,76.4967 -18.1668,15.1646 -48.3421,22.67 -91.0071,22.67l-39.0085 0 0 -187.999z"
id="glyph24" />
<glyph
unicode="W"
horiz-adv-x="970"
d="M562.997 715.009l89.8332 -340.011c4.17605,-15.1646 8.1789,-31.1568 11.6621,-47.8225 3.67569,-16.5117 7.33214,-35.6792 11.335,-57.1753 4.83036,25.4989 9.00641,46.3407 12.3357,62.8332 3.50249,16.4925 6.83178,30.5025 10.0071,42.1646l84.0021 340.011 196.832 0 -202.163 -715.009 -180.667 0 -88.3321 305.333c-3.34854,10.6614 -8.67925,31.6764 -16.1846,63.0064 -3.15609,13.9907 -5.83107,24.8254 -7.8325,32.6579 -1.50107,-6.83178 -3.82965,-16.4925 -6.83178,-28.8282 -7.4861,-31.6764 -13.1632,-53.8268 -16.9929,-66.836l-87.0042 -305.333 -181.167 0 -201.836 715.009 197.006 0 82.0007 -341.839c4.00285,-17.6664 7.8325,-35.1789 11.5082,-52.8453 3.82965,-17.4932 7.33214,-35.66 10.4882,-54.1539 3.00214,13.6636 6.17747,28.0007 9.50676,42.9921 3.50249,15.0107 8.66001,36.3335 15.4918,64.0071l89.8332 341.839 157.17 0z"
id="glyph26" />
</font>
<style
type="text/css"
id="style29">
<![CDATA[
@font-face { font-family:"Futura Md BT";font-variant:normal;font-style:normal;font-weight:bold;src:url("#FontID0") format(svg)}
.fil2 {fill:#336666}
.fil0 {fill:#E6E6E6}
.fil1 {fill:#003333;fill-rule:nonzero}
.fnt0 {font-weight:bold;font-size:1.287px;font-family:'Futura Md BT'}
]]>
</style>
</defs>
<g
id="Layer_x0020_1"
transform="translate(11.673934,11.673698)">
<metadata
id="CorelCorpID_0Corel-Layer" />
<g
id="_2302217657600"
transform="matrix(3.4756515,0,0,3.4756515,-11.673934,-11.673934)">
<g
id="g42">
<path
class="fil1"
d="M 6.32,3.205 C 6.038,2.964 5.738,2.783 5.424,2.663 5.108,2.543 4.777,2.482 4.43,2.482 3.759,2.482 3.212,2.697 2.791,3.129 2.369,3.561 2.159,4.119 2.159,4.805 c 0,0.662 0.205,1.21 0.615,1.642 0.41,0.432 0.928,0.647 1.552,0.647 0.364,0 0.71,-0.065 1.04,-0.194 C 5.694,6.771 6.01,6.577 6.312,6.316 v 1.13 C 6.044,7.64 5.751,7.785 5.434,7.879 5.117,7.975 4.774,8.022 4.406,8.022 3.936,8.022 3.501,7.945 3.102,7.791 2.702,7.636 2.352,7.41 2.049,7.11 1.749,6.816 1.52,6.469 1.358,6.07 1.197,5.671 1.117,5.245 1.117,4.795 1.117,4.343 1.197,3.92 1.358,3.525 1.52,3.128 1.752,2.781 2.058,2.481 2.363,2.178 2.713,1.949 3.108,1.794 3.502,1.638 3.93,1.56 4.389,1.56 4.75,1.56 5.095,1.613 5.422,1.718 5.75,1.824 6.067,1.983 6.376,2.197 L 6.321,3.204 Z"
id="path36" />
<path
class="fil2"
d="M 5.438,4.315 H 5.819 C 6.295,4.315 6.631,4.25 6.829,4.12 7.025,3.99 7.124,3.77 7.124,3.463 7.124,3.126 7.034,2.891 6.852,2.755 6.771,2.694 6.658,2.647 6.512,2.614 L 6.539,2.118 6.466,2.067 C 6.272,1.932 6.068,1.814 5.854,1.717 h 0.155 c 0.443,0 0.77,0.024 0.981,0.072 C 7.202,1.836 7.381,1.915 7.531,2.024 7.722,2.165 7.87,2.348 7.974,2.575 8.079,2.803 8.132,3.053 8.132,3.328 8.132,3.656 8.056,3.93 7.905,4.15 7.753,4.371 7.534,4.524 7.245,4.61 7.603,4.666 7.885,4.829 8.09,5.1 8.295,5.37 8.398,5.711 8.398,6.123 8.398,6.371 8.355,6.608 8.268,6.833 8.182,7.057 8.059,7.247 7.899,7.404 7.73,7.575 7.522,7.695 7.272,7.765 7.022,7.835 6.605,7.87 6.017,7.87 H 5.909 C 6.082,7.789 6.248,7.691 6.404,7.578 L 6.47,7.53 V 7.006 C 6.505,7.002 6.537,6.998 6.567,6.993 6.74,6.964 6.877,6.916 6.979,6.845 7.102,6.765 7.197,6.654 7.264,6.518 7.331,6.38 7.364,6.23 7.364,6.063 7.364,5.868 7.324,5.696 7.242,5.551 7.16,5.405 7.044,5.291 6.893,5.211 6.798,5.162 6.689,5.128 6.567,5.105 6.445,5.083 6.283,5.072 6.081,5.072 H 5.78 5.436 V 6.696 C 5.393,6.716 5.349,6.734 5.304,6.752 5.03,6.859 4.747,6.918 4.455,6.932 V 2.643 c 0.312,0.003 0.617,0.058 0.909,0.17 0.024,0.009 0.048,0.019 0.072,0.029 v 1.474 z"
id="path38" />
<path
class="fil1"
d="M 6.32,3.205 C 6.038,2.964 5.738,2.783 5.424,2.663 5.108,2.543 4.777,2.482 4.43,2.482 3.759,2.482 3.212,2.697 2.791,3.129 2.369,3.561 2.159,4.119 2.159,4.805 c 0,0.662 0.205,1.21 0.615,1.642 0.41,0.432 0.928,0.647 1.552,0.647 0.364,0 0.71,-0.065 1.04,-0.194 C 5.694,6.771 6.01,6.577 6.312,6.316 v 1.13 C 6.044,7.64 5.751,7.785 5.434,7.879 5.117,7.975 4.774,8.022 4.406,8.022 3.936,8.022 3.501,7.945 3.102,7.791 2.702,7.636 2.352,7.41 2.049,7.11 1.749,6.816 1.52,6.469 1.358,6.07 1.197,5.671 1.117,5.245 1.117,4.795 1.117,4.343 1.197,3.92 1.358,3.525 1.52,3.128 1.752,2.781 2.058,2.481 2.363,2.178 2.713,1.949 3.108,1.794 3.502,1.638 3.93,1.56 4.389,1.56 4.75,1.56 5.095,1.613 5.422,1.718 5.75,1.824 6.067,1.983 6.376,2.197 L 6.321,3.204 Z"
id="path40" />
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB