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

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-01-27 20:20:55 +05:30
parent 67664e7956
commit d0cfb55682
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/ebooks/docx/to_html.py
View File

@ -376,10 +376,13 @@ class Convert(object):
def p_parent(x): def p_parent(x):
# Ensure that nested <w:p> tags are handled. These can occur if a # Ensure that nested <w:p> tags are handled. These can occur if a
# textbox is present inside a paragraph. # textbox is present inside a paragraph.
while x is not None: while True:
x = x.getparent() x = x.getparent()
if x.tag.endswith('}p'): try:
return x if x.tag.endswith('}p'):
return x
except AttributeError:
break
for x in descendants(p, 'w:r', 'w:bookmarkStart', 'w:hyperlink'): for x in descendants(p, 'w:r', 'w:bookmarkStart', 'w:hyperlink'):
if p_parent(x) is not p: if p_parent(x) is not p: