mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-06-23 15:30:45 -04:00
When generating covers, do not render soft-hyphens in the text as hyphens. Fixes #1344259 [title contains softhyphens that only appear when generating title pages](https://bugs.launchpad.net/calibre/+bug/1344259)
This commit is contained in:
parent
b6540810bf
commit
c052186b18
@ -186,7 +186,9 @@ def calibre_cover(title, author_string, series_string=None,
|
|||||||
author_string = normalize(author_string)
|
author_string = normalize(author_string)
|
||||||
series_string = normalize(series_string)
|
series_string = normalize(series_string)
|
||||||
from calibre.utils.magick.draw import create_cover_page, TextLine
|
from calibre.utils.magick.draw import create_cover_page, TextLine
|
||||||
text = title + author_string + (series_string or u'')
|
import regex
|
||||||
|
pat = regex.compile(ur'\p{Cf}+', flags=regex.VERSION1) # remove non-printing chars like the soft hyphen
|
||||||
|
text = pat.sub(u'', title + author_string + (series_string or u''))
|
||||||
font_path = tweaks['generate_cover_title_font']
|
font_path = tweaks['generate_cover_title_font']
|
||||||
if font_path is None:
|
if font_path is None:
|
||||||
font_path = P('fonts/liberation/LiberationSerif-Bold.ttf')
|
font_path = P('fonts/liberation/LiberationSerif-Bold.ttf')
|
||||||
@ -203,10 +205,10 @@ def calibre_cover(title, author_string, series_string=None,
|
|||||||
font_path = pt.name
|
font_path = pt.name
|
||||||
cleanup = True
|
cleanup = True
|
||||||
|
|
||||||
lines = [TextLine(title, title_size, font_path=font_path),
|
lines = [TextLine(pat.sub(u'', title), title_size, font_path=font_path),
|
||||||
TextLine(author_string, author_size, font_path=font_path)]
|
TextLine(pat.sub(u'', author_string), author_size, font_path=font_path)]
|
||||||
if series_string:
|
if series_string:
|
||||||
lines.append(TextLine(series_string, author_size, font_path=font_path))
|
lines.append(TextLine(pat.sub(u'', series_string), author_size, font_path=font_path))
|
||||||
if logo_path is None:
|
if logo_path is None:
|
||||||
logo_path = I('library.png')
|
logo_path = I('library.png')
|
||||||
try:
|
try:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user