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

included divs in the fix indents option

Browse Source
This commit is contained in:
ldolse 2011-02-08 13:26:05 +08:00
parent cdcfde6625
commit d080ac85d6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/ebooks/conversion/utils.py
View File

@ -77,22 +77,23 @@ class HeuristicProcessor(object):
def insert_indent(self, match): def insert_indent(self, match):
pstyle = match.group('formatting') pstyle = match.group('formatting')
tag = match.group('tagtype')
span = match.group('span') span = match.group('span')
self.found_indents = self.found_indents + 1 self.found_indents = self.found_indents + 1
if pstyle: if pstyle:
if pstyle.lower().find('style'): if pstyle.lower().find('style') != -1:
pstyle = re.sub(r'"$', '; text-indent:3%"', pstyle) pstyle = re.sub(r'"$', '; text-indent:3%"', pstyle)
else: else:
pstyle = pstyle+' style="text-indent:3%"' pstyle = pstyle+' style="text-indent:3%"'
if not span: if not span:
return '<p '+pstyle+'>' return '<'+tag+' '+pstyle+'>'
else: else:
return '<p '+pstyle+'>'+span return '<'+tag+' '+pstyle+'>'+span
else: else:
if not span: if not span:
return '<p style="text-indent:3%">' return '<'+tag+' style="text-indent:3%">'
else: else:
return '<p style="text-indent:3%">'+span return '<'+tag+' style="text-indent:3%">'+span
def no_markup(self, raw, percent): def no_markup(self, raw, percent):
''' '''
@ -365,7 +366,7 @@ class HeuristicProcessor(object):
return html return html
def fix_nbsp_indents(self, html): def fix_nbsp_indents(self, html):
txtindent = re.compile(ur'<p(?P<formatting>[^>]*)>\s*(?P<span>(<span[^>]*>\s*)+)?\s*(\u00a0){2,}', re.IGNORECASE) txtindent = re.compile(ur'<(?P<tagtype>p|div)(?P<formatting>[^>]*)>\s*(?P<span>(<span[^>]*>\s*)+)?\s*(\u00a0){2,}', re.IGNORECASE)
html = txtindent.sub(self.insert_indent, html) html = txtindent.sub(self.insert_indent, html)
if self.found_indents > 1: if self.found_indents > 1:
self.log.debug("replaced "+unicode(self.found_indents)+ " nbsp indents with inline styles") self.log.debug("replaced "+unicode(self.found_indents)+ " nbsp indents with inline styles")