Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Edit book: Fix SVG files not being beautified by the Beautify all files tool

Browse Source
This commit is contained in:
Kovid Goyal 2018-06-05 15:14:47 +05:30
parent 164339dc2b
commit 7df3515b10
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/ebooks/oeb/polish/pretty.py
View File

@ -89,8 +89,8 @@ def pretty_opf(root):
for x in reversed(children): for x in reversed(children):
manifest.insert(0, x) manifest.insert(0, x)
SVG_TAG = SVG('svg')
SVG_TAG = SVG('svg')
BLOCK_TAGS = frozenset(map(XHTML, ( BLOCK_TAGS = frozenset(map(XHTML, (
'address', 'article', 'aside', 'audio', 'blockquote', 'body', 'canvas', 'dd', 'address', 'article', 'aside', 'audio', 'blockquote', 'body', 'canvas', 'dd',
'div', 'dl', 'dt', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'div', 'dl', 'dt', 'fieldset', 'figcaption', 'figure', 'footer', 'form',
@ -183,8 +183,8 @@ def pretty_html_tree(container, root):
# Special case the handling of a body that contains a single block tag # Special case the handling of a body that contains a single block tag
# with all content. In this case we prettify the containing block tag # with all content. In this case we prettify the containing block tag
# even if it has non block children. # even if it has non block children.
if (len(body) == 1 and not callable(body[0].tag) and isblock(body[0]) and if (len(body) == 1 and not callable(body[0].tag) and isblock(body[0]) and not has_only_blocks(
not has_only_blocks(body[0]) and barename(body[0].tag) not in ( body[0]) and barename(body[0].tag) not in (
'pre', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6') and len(body[0]) > 0): 'pre', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6') and len(body[0]) > 0):
pretty_block(body[0], level=2) pretty_block(body[0], level=2)
@ -232,6 +232,7 @@ def fix_all_html(container):
def pretty_all(container): def pretty_all(container):
' Pretty print all HTML/CSS/XML files in the container ' ' Pretty print all HTML/CSS/XML files in the container '
xml_types = {guess_type('a.ncx'), guess_type('a.xml'), guess_type('a.svg')}
for name, mt in container.mime_map.iteritems(): for name, mt in container.mime_map.iteritems():
prettied = False prettied = False
if mt in OEB_DOCS: if mt in OEB_DOCS:
@ -245,10 +246,8 @@ def pretty_all(container):
pretty_opf(root) pretty_opf(root)
pretty_xml_tree(root) pretty_xml_tree(root)
prettied = True prettied = True
elif mt in {guess_type('a.ncx'), guess_type('a.xml')}: elif mt in xml_types:
pretty_xml_tree(container.parsed(name)) pretty_xml_tree(container.parsed(name))
prettied = True prettied = True
if prettied: if prettied:
container.dirty(name) container.dirty(name)