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

ODT Input: Fix fallback PNG images generated by LibreOffice 4.x for SVG images not being ignored

Browse Source
This commit is contained in:
Kovid Goyal 2016-01-27 10:08:03 +05:30
parent 8a1263f987
commit 7a18787eda
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/odf/odf2xhtml.py
View File

@ -358,6 +358,7 @@ class ODF2XHTML(handler.ContentHandler):
def __init__(self, generate_css=True, embedable=False): def __init__(self, generate_css=True, embedable=False):
# Tags # Tags
self.generate_css = generate_css self.generate_css = generate_css
self.frame_stack = []
self.elements = { self.elements = {
(DCNS, 'title'): (self.s_processcont, self.e_dc_title), (DCNS, 'title'): (self.s_processcont, self.e_dc_title),
(DCNS, 'language'): (self.s_processcont, self.e_dc_contentlanguage), (DCNS, 'language'): (self.s_processcont, self.e_dc_contentlanguage),
@ -697,6 +698,7 @@ class ODF2XHTML(handler.ContentHandler):
def s_draw_frame(self, tag, attrs): def s_draw_frame(self, tag, attrs):
""" A <draw:frame> is made into a <div> in HTML which is then styled """ A <draw:frame> is made into a <div> in HTML which is then styled
""" """
self.frame_stack.append([])
anchor_type = attrs.get((TEXTNS,'anchor-type'),'notfound') anchor_type = attrs.get((TEXTNS,'anchor-type'),'notfound')
htmltag = 'div' htmltag = 'div'
name = "G-" + attrs.get((DRAWNS,'style-name'), "") name = "G-" + attrs.get((DRAWNS,'style-name'), "")
@ -729,6 +731,7 @@ class ODF2XHTML(handler.ContentHandler):
""" End the <draw:frame> """ End the <draw:frame>
""" """
self.closetag('div') self.closetag('div')
self.frame_stack.pop()
def s_draw_fill_image(self, tag, attrs): def s_draw_fill_image(self, tag, attrs):
name = attrs.get((DRAWNS,'name'), "NoName") name = attrs.get((DRAWNS,'name'), "NoName")
@ -745,6 +748,10 @@ class ODF2XHTML(handler.ContentHandler):
def s_draw_image(self, tag, attrs): def s_draw_image(self, tag, attrs):
""" A <draw:image> becomes an <img/> element """ A <draw:image> becomes an <img/> element
""" """
if self.frame_stack:
if self.frame_stack[-1]:
return
self.frame_stack[-1].append('img')
parent = self.tagstack.stackparent() parent = self.tagstack.stackparent()
anchor_type = parent.get((TEXTNS,'anchor-type')) anchor_type = parent.get((TEXTNS,'anchor-type'))
imghref = attrs[(XLINKNS,"href")] imghref = attrs[(XLINKNS,"href")]