This commit is contained in:
Kovid Goyal 2015-03-10 09:30:16 +05:30
parent 86c6b89334
commit 9c3b49c9ff

View File

@ -74,15 +74,15 @@ class DOCXStyle(object):
return bdr return bdr
LINE_STYLES = { LINE_STYLES = {
'none': 'none', 'none' : 'none',
'hidden': 'none', 'hidden': 'none',
'dotted': 'dotted', 'dotted': 'dotted',
'dashed': 'dashed', 'dashed': 'dashed',
'solid': 'single', 'solid' : 'single',
'double': 'double', 'double': 'double',
'groove': 'threeDEngrave', 'groove': 'threeDEngrave',
'ridge': 'threeDEmboss', 'ridge' : 'threeDEmboss',
'inset': 'inset', 'inset' : 'inset',
'outset': 'outset', 'outset': 'outset',
} }
@ -175,10 +175,10 @@ class TextStyle(DOCXStyle):
class BlockStyle(DOCXStyle): class BlockStyle(DOCXStyle):
ALL_PROPS = tuple( ALL_PROPS = tuple(
'text_align page_break_before keep_lines css_text_indent text_indent line_height css_line_height background_color'.split() 'text_align page_break_before keep_lines css_text_indent text_indent line_height css_line_height background_color'.split() +
+ ['margin_' + edge for edge in border_edges] ['margin_' + edge for edge in border_edges] +
+ ['css_margin_' + edge for edge in border_edges] ['css_margin_' + edge for edge in border_edges] +
+ [x%edge for edge in border_edges for x in border_props] [x%edge for edge in border_edges for x in border_props]
) )
def __init__(self, css, html_block, is_first_block=False): def __init__(self, css, html_block, is_first_block=False):