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

DOCX Output: Add support for underline style and color

Browse Source
This commit is contained in:
Kovid Goyal 2023-08-01 10:06:10 +05:30
parent 1b39279dd1
commit 3fd4ca7735
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/calibre/ebooks/docx/writer/styles.py
View File

@ -199,6 +199,24 @@ LINE_STYLES = {
'outset': 'outset',
}
def convert_underline(items):
style = 'solid'
has_underline = False
color = 'auto'
for x in items:
if x in {'solid', 'double', 'dotted', 'dashed', 'wavy'}:
style = {'solid': 'single', 'wavy': 'wave', 'dashed': 'dash'}.get(x, x)
elif x in {'underline', 'overline', 'line-through', 'blink', 'none'}:
if x == 'underline':
has_underline = True
elif x == 'none':
has_underline = False
else:
color = convert_color(x)
if has_underline:
return style + ' ' + color
return ''
class TextStyle(DOCXStyle):
@ -221,7 +239,7 @@ class TextStyle(DOCXStyle):
self.color = convert_color(css['color'])
self.background_color = None if is_parent_style else convert_color(css.backgroundColor)
td = set((css.effective_text_decoration or '').split())
self.underline = 'underline' in td
self.underline = convert_underline(td)
self.dstrike = 'line-through' in td and 'overline' in td
self.strike = not self.dstrike and 'line-through' in td
self.text_transform = css['text-transform'] # TODO: If lowercase or capitalize, transform the actual text
@ -330,7 +348,11 @@ class TextStyle(DOCXStyle):
if check_attr('background_color'):
rPr.append(makeelement(rPr, 'shd', fill=self.background_color or 'auto'))
if check_attr('underline'):
rPr.append(makeelement(rPr, 'u', val='single' if self.underline else 'none'))
style, color = self.underline.partition(' ')[::2]
if color != 'auto':
rPr.append(makeelement(rPr, 'u', val=style, color=color))
else:
rPr.append(makeelement(rPr, 'u', val=style))
if check_attr('dstrike'):
rPr.append(makeelement(rPr, 'dstrike', val=bmap(self.dstrike)))
if check_attr('strike'):
@ -389,7 +411,11 @@ class DescendantTextStyle:
if check('background_color'):
add('shd', fill=child_style.background_color or 'auto')
if check('underline'):
add('u', val='single' if child_style.underline else 'none')
if not child_style.underline:
add('u', val='none')
else:
style, color = child_style.underline.partition(' ')[::2]
add('u', val=style, color=color)
if check('dstrike'):
add('dstrike', val=bmap(child_style.dstrike))
if check('strike'):