mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'fix-comments-markdown' of https://github.com/un-pogaz/calibre
This commit is contained in:
commit
8d6b2750b8
@ -134,7 +134,8 @@ def markdown(val):
|
||||
except AttributeError:
|
||||
from calibre.ebooks.markdown import Markdown
|
||||
md = markdown.Markdown = Markdown()
|
||||
return md.convert(val)
|
||||
val = md.convert(val)
|
||||
return re.sub(r'<p(|\s+[^>]*?)>\s*<br\s*/?>\s*</p>','<p\\1>\xa0</p>', val)
|
||||
|
||||
|
||||
def merge_comments(one, two):
|
||||
|
Loading…
x
Reference in New Issue
Block a user