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

Merge branch 'fix-comments-markdown' of https://github.com/un-pogaz/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2023-04-24 22:41:55 +05:30
commit 8d6b2750b8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/library/comments.py
View File

@ -134,7 +134,8 @@ def markdown(val):
except AttributeError: except AttributeError:
from calibre.ebooks.markdown import Markdown from calibre.ebooks.markdown import Markdown
md = markdown.Markdown = 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): def merge_comments(one, two):