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

Smarten punctuation: Fix double dashes and triple dots being smartened even inside attribute values. Fixes #1598465 [Problem with smarten punctuation when using ebook-convert](https://bugs.launchpad.net/calibre/+bug/1598465)

Browse Source 
There was a postprocess step that calibre was doing after the call to
smartypants that was unneccessary and was causing this bug.
This commit is contained in:
Kovid Goyal 2016-07-05 15:28:52 +05:30
parent 88e3e0fb9f
commit 44ae597f14
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/conversion/preprocess.py
View File

@ -62,7 +62,7 @@ def wrap_lines(match):
else: else:
return ital+' ' return ital+' '
def smarten_punctuation(html, log): def smarten_punctuation(html, log=None):
from calibre.utils.smartypants import smartyPants from calibre.utils.smartypants import smartyPants
from calibre.ebooks.chardet import substitute_entites from calibre.ebooks.chardet import substitute_entites
from calibre.ebooks.conversion.utils import HeuristicProcessor from calibre.ebooks.conversion.utils import HeuristicProcessor
@ -76,10 +76,6 @@ def smarten_punctuation(html, log):
html = smartyPants(html) html = smartyPants(html)
html = html.replace(start, '<!--') html = html.replace(start, '<!--')
html = html.replace(stop, '-->') html = html.replace(stop, '-->')
# convert ellipsis to entities to prevent wrapping
html = re.sub(r'(?u)(?<=\w)\s?(\.\s?){2}\.', '&hellip;', html)
# convert double dashes to em-dash
html = re.sub(r'\s--\s', u'\u2014', html)
return substitute_entites(html) return substitute_entites(html)
class DocAnalysis(object): class DocAnalysis(object):