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

Process alignment at block level as well

Browse Source
This commit is contained in:
Kovid Goyal 2007-08-22 00:56:56 +00:00
parent 0104da8351
commit 4c4a5fe646
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libprs500/ebooks/lrf/html/convert_from.py
View File

@ -531,11 +531,7 @@ class HTMLConverter(object):
if not self.in_table: if not self.in_table:
ptag.extract() ptag.extract()
def process_alignment(self, css): def get_alignment(self, css):
'''
Create a new TextBlock only if necessary as indicated by css
@type css: dict
'''
align = 'head' align = 'head'
if css.has_key('text-align'): if css.has_key('text-align'):
val = css['text-align'].lower() val = css['text-align'].lower()
@ -550,6 +546,14 @@ class HTMLConverter(object):
if val == 'right': if val == 'right':
align = 'foot' align = 'foot'
css.pop('float') css.pop('float')
return align
def process_alignment(self, css):
'''
Create a new TextBlock only if necessary as indicated by css
@type css: dict
'''
align = self.get_alignment(css)
if align != self.current_block.textStyle.attrs['align']: if align != self.current_block.textStyle.attrs['align']:
self.current_para.append_to(self.current_block) self.current_para.append_to(self.current_block)
self.current_block.append_to(self.current_page) self.current_block.append_to(self.current_page)
@ -1038,11 +1042,14 @@ class HTMLConverter(object):
''' Ensure padding and text-indent properties are respected ''' ''' Ensure padding and text-indent properties are respected '''
text_properties = self.text_properties(tag_css) text_properties = self.text_properties(tag_css)
block_properties = self.block_properties(tag_css) block_properties = self.block_properties(tag_css)
align = self.get_alignment(tag_css)
if properties_different(self.current_block.blockStyle.attrs, block_properties) or \ if properties_different(self.current_block.blockStyle.attrs, block_properties) or \
properties_different(self.current_block.textStyle.attrs, text_properties): properties_different(self.current_block.textStyle.attrs, text_properties) or\
align != self.current_block.textStyle.attrs['align']:
ts = self.current_block.textStyle.copy() ts = self.current_block.textStyle.copy()
ts.attrs.update(text_properties) ts.attrs.update(text_properties)
ts.attrs['align'] = align
bs = self.current_block.blockStyle.copy() bs = self.current_block.blockStyle.copy()
bs.attrs.update(block_properties) bs.attrs.update(block_properties)
self.current_block.append_to(self.current_page) self.current_block.append_to(self.current_page)