diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index e45657d878..e69d42c90a 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -465,7 +465,3 @@ if isosx: except: import traceback traceback.print_exc() - -# Migrate from QSettings based config system -from calibre.utils.config import migrate -migrate() diff --git a/src/calibre/constants.py b/src/calibre/constants.py index d9d5ee0cfc..369e92a6aa 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -2,7 +2,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = 'calibre' -__version__ = '0.4.141' +__version__ = '0.4.142' __author__ = "Kovid Goyal " ''' Various run time constants. diff --git a/src/calibre/ebooks/html.py b/src/calibre/ebooks/html.py index d89fc3c9a9..0bf650a640 100644 --- a/src/calibre/ebooks/html.py +++ b/src/calibre/ebooks/html.py @@ -845,7 +845,12 @@ class Processor(Parser): except: size = '3' if size and size.strip() and size.strip()[0] in ('+', '-'): - size = 3 + float(size) # Hack assumes basefont=3 + size = re.search(r'[+-]{0,1}[\d\.]+', size) + try: + size = float(size.group()) + except: + size = 0 + size += 3 # Hack assumes basefont=3 try: setting = 'font-size: %d%%;'%int((float(size)/3) * 100) except ValueError: diff --git a/src/calibre/ebooks/lit/reader.py b/src/calibre/ebooks/lit/reader.py index 32bfa1a874..1ac68f3866 100644 --- a/src/calibre/ebooks/lit/reader.py +++ b/src/calibre/ebooks/lit/reader.py @@ -122,11 +122,15 @@ class UnBinary(object): OPEN_ANGLE_RE = re.compile(r'<<(?![!]--)') CLOSE_ANGLE_RE = re.compile(r'(?